diff --git a/src/gba/cheats.c b/src/gba/cheats.c
index 81497ec62..8b5f5804b 100644
--- a/src/gba/cheats.c
+++ b/src/gba/cheats.c
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "cheats.h"
 
+#include "core/core.h"
 #include "gba/cheats/gameshark.h"
 #include "gba/cheats/parv3.h"
 #include "gba/gba.h"
diff --git a/src/gba/gba.h b/src/gba/gba.h
index 7adc8bd2b..bcbdc544e 100644
--- a/src/gba/gba.h
+++ b/src/gba/gba.h
@@ -152,8 +152,11 @@ void GBAHalt(struct GBA* gba);
 void GBAStop(struct GBA* gba);
 void GBADebug(struct GBA* gba, uint16_t value);
 
+#ifdef USE_DEBUGGERS
+struct mDebugger;
 void GBAAttachDebugger(struct GBA* gba, struct mDebugger* debugger);
 void GBADetachDebugger(struct GBA* gba);
+#endif
 
 void GBASetBreakpoint(struct GBA* gba, struct mCPUComponent* component, uint32_t address, enum ExecutionMode mode,
                       uint32_t* opcode);
diff --git a/src/gba/video.h b/src/gba/video.h
index 01ef2b55e..c25df5ef8 100644
--- a/src/gba/video.h
+++ b/src/gba/video.h
@@ -10,7 +10,6 @@
 
 CXX_GUARD_START
 
-#include "core/core.h"
 #include "core/timing.h"
 #include "gba/memory.h"
 
diff --git a/src/platform/qt/AudioDevice.cpp b/src/platform/qt/AudioDevice.cpp
index ae34d3221..44d1139af 100644
--- a/src/platform/qt/AudioDevice.cpp
+++ b/src/platform/qt/AudioDevice.cpp
@@ -7,6 +7,7 @@
 
 #include "LogController.h"
 
+#include "core/core.h"
 #include "core/thread.h"
 #include "gba/audio.h"
 
diff --git a/src/platform/qt/AudioProcessorQt.cpp b/src/platform/qt/AudioProcessorQt.cpp
index 0f29105ec..ec9b1bdfb 100644
--- a/src/platform/qt/AudioProcessorQt.cpp
+++ b/src/platform/qt/AudioProcessorQt.cpp
@@ -10,6 +10,7 @@
 
 #include <QAudioOutput>
 
+#include "core/core.h"
 #include "core/thread.h"
 
 using namespace QGBA;
diff --git a/src/platform/sdl/sdl-audio.c b/src/platform/sdl/sdl-audio.c
index 913fc99a1..c731cfba7 100644
--- a/src/platform/sdl/sdl-audio.c
+++ b/src/platform/sdl/sdl-audio.c
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "sdl-audio.h"
 
+#include "core/core.h"
 #include "core/thread.h"
 #include "gba/gba.h"