diff --git a/src/gui/gui.h b/src/gui/gui.h
index 5074286f..e517c94a 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1,6 +1,8 @@
 #ifndef RENDEZVOUS_H
 #define RENDEZVOUS_H
 
+#include <wx/wx.h>
+
 extern void runOnUiThread(std::function<void()> callback);
 extern void runOnWorkerThread(std::function<void()> callback);
 
diff --git a/src/gui/main.cc b/src/gui/main.cc
index 176f11df..091ad4df 100644
--- a/src/gui/main.cc
+++ b/src/gui/main.cc
@@ -1,7 +1,6 @@
 #include "globals.h"
-#include <wx/wx.h>
-#include "mainwindow.h"
 #include "gui.h"
+#include "mainwindow.h"
 #include "utils.h"
 
 class MyApp;
diff --git a/src/gui/mainwindow.cc b/src/gui/mainwindow.cc
index 1dacbf63..afc381c2 100644
--- a/src/gui/mainwindow.cc
+++ b/src/gui/mainwindow.cc
@@ -8,11 +8,9 @@
 #include "lib/usb/usbfinder.h"
 #include "fmt/format.h"
 #include "utils.h"
-#include <wx/wx.h>
 #include "mainwindow.h"
 #include <google/protobuf/text_format.h>
 
-
 extern const std::map<std::string, std::string> formats;
 
 MainWindow::MainWindow(): MainWindowGen(nullptr)
diff --git a/src/gui/visualisation.cc b/src/gui/visualisation.cc
index 4f44059b..4abcb079 100644
--- a/src/gui/visualisation.cc
+++ b/src/gui/visualisation.cc
@@ -1,10 +1,10 @@
 #include "globals.h"
+#include "gui.h"
 #include "visualisation.h"
 #include "fluxmap.h"
 #include "flux.h"
 #include "sector.h"
 #include "fmt/format.h"
-#include <wx/wx.h>
 
 #define BORDER 20
 #define TICK 3