4 files changed, 19 insertions, 21 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index ae48c4a2d4..f97bc527ef 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -21,8 +21,10 @@
  */
 #include "common/stdafx.h"
 
+#include "base/gameDetector.h"
 #include "base/plugins.h"
 #include "backends/fs/fs.h"
+#include "common/config-manager.h"
 #include "common/md5.h"
 
 #include "gob/gob.h"
@@ -51,7 +53,18 @@ enum {
 	kMD5FileSizeLimit = 1024 * 1024
 };
 
-static const Gob::GobGameSettings gob_games[] = {
+struct GobGameSettings {
+	const char *gameid;
+	const char *description;
+	uint32 features;
+	const char *md5sum;
+	GameSettings toGameSettings() const {
+		GameSettings dummy = { gameid, description, features };
+		return dummy;
+	}
+};
+
+static const GobGameSettings gob_games[] = {
 	// Supplied by Florian Zeitz on scummvm-devel
 	{"gob1", "Gobliiins (DOS EGA)", Gob::GF_GOB1, "82aea70ef26f41fa963dfae270993e49"},
 	{"gob1", "Gobliiins (DOS EGA)", Gob::GF_GOB1, "1f499458837008058b8ba6ae07057214"},
@@ -128,7 +141,7 @@ GameList Engine_GOB_gameList() {
 
 DetectedGameList Engine_GOB_detectGames(const FSList &fslist) {
 	DetectedGameList detectedGames;
-	const Gob::GobGameSettings *g;
+	const GobGameSettings *g;
 	FSList::const_iterator file;
 
 	// Iterate over all files in the given directory
@@ -182,7 +195,7 @@ Engine *Engine_GOB_create(GameDetector * detector, OSystem *syst) {
 		error("Engine_GOB_create(): Cannot find intro.stk");
 	}
 
-	const Gob::GobGameSettings *g;
+	const GobGameSettings *g;
 	bool found = false;
 
 	// TODO
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index 211ec124ad..074546ffcb 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -25,15 +25,8 @@
 
 #include "common/stdafx.h"
 #include "common/system.h"
-#include "sound/mixer.h"
-#include "common/config-manager.h"
 
 #include "base/engine.h"
-#include "base/gameDetector.h"
-
-#include "gob/dataio.h"
-#include "gob/video.h"
-#include "common/file.h"
 
 namespace Gob {
 
@@ -74,17 +67,6 @@ enum {
 	GF_MAC = 1 << 5
 };
 
-struct GobGameSettings {
-	const char *gameid;
-	const char *description;
-	uint32 features;
-	const char *md5sum;
-	GameSettings toGameSettings() const {
-		GameSettings dummy = { gameid, description, features };
-		return dummy;
-	}
-};
-
 class GobEngine : public Engine {
 	void errorString(const char *buf_input, char *buf_output);
 
diff --git a/engines/gob/music.cpp b/engines/gob/music.cpp
index 3fbb37160f..4d39cfbe73 100644
--- a/engines/gob/music.cpp
+++ b/engines/gob/music.cpp
@@ -21,6 +21,8 @@
  *
  */
 
+#include "common/file.h"
+
 #include "gob/music.h"
 #include "gob/gob.h"
 #include "gob/game.h"
diff --git a/engines/gob/sound.h b/engines/gob/sound.h
index 169c2e03a4..bb763ebca3 100644
--- a/engines/gob/sound.h
+++ b/engines/gob/sound.h
@@ -24,6 +24,7 @@
 #define GOB_SOUND_H
 
 #include "sound/audiostream.h"
+#include "sound/mixer.h"
 
 namespace Gob {