diff --git a/src/platform/qt/GameController.h b/src/platform/qt/GameController.h
index 6608c509c..ae3260ef7 100644
--- a/src/platform/qt/GameController.h
+++ b/src/platform/qt/GameController.h
@@ -7,8 +7,6 @@
 #include <QMutex>
 #include <QString>
 
-#include "AudioDevice.h"
-
 extern "C" {
 #include "gba-thread.h"
 #ifdef BUILD_SDL
@@ -21,6 +19,8 @@ struct GBAVideoSoftwareRenderer;
 
 namespace QGBA {
 
+class AudioDevice;
+
 class GameController : public QObject {
 Q_OBJECT
 
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 58b7e9a7b..45d2ca543 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -5,6 +5,8 @@
 #include <QKeySequence>
 #include <QMenuBar>
 
+#include "AudioDevice.h"
+#include "GameController.h"
 #include "GDBWindow.h"
 #include "GDBController.h"
 
diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
index 958db7b20..429c16741 100644
--- a/src/platform/qt/Window.h
+++ b/src/platform/qt/Window.h
@@ -8,11 +8,12 @@ extern "C" {
 #include "gba.h"
 }
 
-#include "GameController.h"
 #include "Display.h"
 
 namespace QGBA {
 
+class AudioThread;
+class GameController;
 class GDBController;
 
 class Window : public QMainWindow {