4 files changed, 8 insertions, 4 deletions
diff --git a/base/engine.cpp b/base/engine.cpp
index b69e6c6a2a..aabf41822f 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -23,10 +23,12 @@
 #include <malloc.h>
 #endif
 #include "base/engine.h"
+#include "base/gameDetector.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/timer.h"
 #include "common/scaler.h"	// For GFX_NORMAL
+#include "common/system.h"
 #include "sound/mixer.h"
 
 /* FIXME - BIG HACK for MidiEmu */
diff --git a/base/engine.h b/base/engine.h
index 8ee85e6b40..8c907e0ede 100644
--- a/base/engine.h
+++ b/base/engine.h
@@ -23,9 +23,10 @@
 
 #include "common/scummsys.h"
 #include "common/str.h"
-#include "common/system.h"
-#include "base/gameDetector.h"
 
+class GameDetector;
+class OSystem;
+class SaveFileManager;
 class SoundMixer;
 class Timer;
 
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 31b619fa55..e371cf2924 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -46,6 +46,9 @@
 #endif
 #endif
 
+extern int gDebugLevel;
+
+
 // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :)
 #ifdef __PALM_OS__
 static const char USAGE_STRING[] = "NoUsageString"; // save more data segment space
diff --git a/base/gameDetector.h b/base/gameDetector.h
index fc45afd613..e74176d5a4 100644
--- a/base/gameDetector.h
+++ b/base/gameDetector.h
@@ -38,8 +38,6 @@ enum {
 	GF_DEFAULT_TO_1X_SCALER = 1 << 30
 };
 
-extern int gDebugLevel;
-
 struct GameSettings {
 	const char *name;
 	const char *description;