14 files changed, 37 insertions, 17 deletions
diff --git a/engines/hdb/ai-bots.cpp b/engines/hdb/ai-bots.cpp
index fd9ee27bf3..482ae87e63 100644
--- a/engines/hdb/ai-bots.cpp
+++ b/engines/hdb/ai-bots.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/random.h"
+
 #include "hdb/hdb.h"
 #include "hdb/ai.h"
 #include "hdb/ai-player.h"
diff --git a/engines/hdb/ai-player.cpp b/engines/hdb/ai-player.cpp
index 591a9ecc32..aef00e1eb6 100644
--- a/engines/hdb/ai-player.cpp
+++ b/engines/hdb/ai-player.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/random.h"
+
 #include "hdb/hdb.h"
 #include "hdb/ai.h"
 #include "hdb/ai-player.h"
diff --git a/engines/hdb/file-manager.cpp b/engines/hdb/file-manager.cpp
index fc5f2f85fc..575e66ac3a 100644
--- a/engines/hdb/file-manager.cpp
+++ b/engines/hdb/file-manager.cpp
@@ -21,7 +21,7 @@
  */
 #include "common/debug.h"
 #include "common/file.h"
-#include "common/error.h"
+#include "common/memstream.h"
 
 #include "hdb/hdb.h"
 #include "hdb/file-manager.h"
diff --git a/engines/hdb/file-manager.h b/engines/hdb/file-manager.h
index a83512eed7..d4cae4ddad 100644
--- a/engines/hdb/file-manager.h
+++ b/engines/hdb/file-manager.h
@@ -23,11 +23,9 @@
 #ifndef HDB_FILE_MANAGER_H
 #define HDB_FILE_MANAGER_H
 
-#include "common/array.h"
-#include "common/file.h"
-#include "common/error.h"
-#include "common/stream.h"
-#include "common/memstream.h"
+namespace Common {
+	class File;
+}
 
 #define MPCIterator Common::Array<MPCEntry *>::iterator
 
@@ -70,7 +68,7 @@ public:
 		uint32 id;
 		uint32 dirSize;
 	} _dataHeader;
-	
+
 	bool openMPC(const Common::String &filename);
 	void closeMPC();
 	void seek(int32 offset, int flag);
diff --git a/engines/hdb/gfx.cpp b/engines/hdb/gfx.cpp
index 7ff3ba8c11..7c83bf1def 100644
--- a/engines/hdb/gfx.cpp
+++ b/engines/hdb/gfx.cpp
@@ -22,6 +22,7 @@
 
 #include "common/cosinetables.h"
 #include "common/sinetables.h"
+#include "common/random.h"
 
 #include "hdb/hdb.h"
 #include "hdb/ai.h"
diff --git a/engines/hdb/hdb.cpp b/engines/hdb/hdb.cpp
index 21141786a7..f26b558002 100644
--- a/engines/hdb/hdb.cpp
+++ b/engines/hdb/hdb.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/random.h"
+
 #include "hdb/hdb.h"
 #include "hdb/ai.h"
 #include "hdb/file-manager.h"
diff --git a/engines/hdb/hdb.h b/engines/hdb/hdb.h
index bef4ac64ca..6474d5e3f0 100644
--- a/engines/hdb/hdb.h
+++ b/engines/hdb/hdb.h
@@ -25,10 +25,10 @@
 
 #include "common/scummsys.h"
 #include "common/system.h"
-#include "common/array.h"
-#include "common/events.h"
-#include "common/str.h"
-#include "common/random.h"
+//#include "common/array.h"
+//#include "common/events.h"
+//#include "common/str.h"
+//#include "common/random.h"
 #include "common/savefile.h"
 #include "common/config-manager.h"
 #include "graphics/surface.h"
@@ -42,6 +42,10 @@
 #include "engines/engine.h"
 #include "engines/util.h"
 
+namespace Common {
+	class RandomSource;
+}
+
 namespace HDB {
 class AI;
 struct AIEntity;
diff --git a/engines/hdb/input.h b/engines/hdb/input.h
index 11b854a353..9ea364a4e1 100644
--- a/engines/hdb/input.h
+++ b/engines/hdb/input.h
@@ -23,6 +23,8 @@
 #ifndef HDB_INPUT_H
 #define HDB_INPUT_H
 
+#include "common/events.h"
+
 namespace HDB {
 
 enum Button {
diff --git a/engines/hdb/lua-script.cpp b/engines/hdb/lua-script.cpp
index 4d3e0ef821..fb8a2bf88c 100644
--- a/engines/hdb/lua-script.cpp
+++ b/engines/hdb/lua-script.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "common/file.h"
 #include "common/lua/lua.h"
 #include "common/lua/lauxlib.h"
 #include "common/lua/lualib.h"
diff --git a/engines/hdb/menu.cpp b/engines/hdb/menu.cpp
index 8d42f9c242..68d1f3c0d2 100644
--- a/engines/hdb/menu.cpp
+++ b/engines/hdb/menu.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/random.h"
+
 #include "hdb/hdb.h"
 #include "hdb/ai.h"
 #include "hdb/gfx.h"
diff --git a/engines/hdb/menu.h b/engines/hdb/menu.h
index a17d2cb4bd..5f846b020b 100644
--- a/engines/hdb/menu.h
+++ b/engines/hdb/menu.h
@@ -23,6 +23,8 @@
 #ifndef HDB_MENU_H
 #define HDB_MENU_H
 
+#include "common/events.h"
+
 namespace HDB {
 
 #define	CONFIG_MUSICVOL		"music_volume"
diff --git a/engines/hdb/sound.cpp b/engines/hdb/sound.cpp
index cd81ab4318..97805e1725 100644
--- a/engines/hdb/sound.cpp
+++ b/engines/hdb/sound.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/debug.h"
+
 #include "hdb/hdb.h"
 #include "hdb/mpc.h"
 #include "hdb/sound.h"
diff --git a/engines/hdb/sound.h b/engines/hdb/sound.h
index 56702c0c5d..c5350af443 100644
--- a/engines/hdb/sound.h
+++ b/engines/hdb/sound.h
@@ -1416,24 +1416,24 @@ public:
 	void loadSaveFile(Common::InSaveFile *in);
 	void clearPersistent();
 	void setMusicVolume(int value) {
-		debug(9, "STUB: Add Music System Variables");
+		//debug(9, "STUB: Add Music System Variables");
 	}
 	int getMusicVolume() {
-		debug(9, "STUB: Add Music System Variables");
+		//debug(9, "STUB: Add Music System Variables");
 		return 1;
 	}
 	void setSFXVolume(int value) {
-		debug(9, "STUB: Add Music System Variables");
+		//debug(9, "STUB: Add Music System Variables");
 	}
 	int getSFXVolume() {
-		debug(9, "STUB: Add Music System Variables");
+		//debug(9, "STUB: Add Music System Variables");
 		return 1;
 	}
 	void setVoiceStatus(int value) {
-		debug(9, "STUB: Add Music System Variables");
+		//debug(9, "STUB: Add Music System Variables");
 	}
 	int getVoiceStatus() {
-		debug(9, "STUB: Add Music System Variables");
+		//debug(9, "STUB: Add Music System Variables");
 		return 1;
 	}
 
diff --git a/engines/hdb/window.cpp b/engines/hdb/window.cpp
index 7809c070c9..5a1e673cce 100644
--- a/engines/hdb/window.cpp
+++ b/engines/hdb/window.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/random.h"
+
 #include "hdb/hdb.h"
 #include "hdb/ai.h"
 #include "hdb/gfx.h"