HDB: Reduce header dependency

19 files changed, 32 insertions, 4 deletions

diff --git a/engines/hdb/ai-bots.cpp b/engines/hdb/ai-bots.cpp
index cd031d4359..41e21b714f 100644
--- a/engines/hdb/ai-bots.cpp
+++ b/engines/hdb/ai-bots.cpp
@@ -25,6 +25,8 @@
 #include "hdb/lua-script.h"
 #include "hdb/map.h"
 #include "hdb/mpc.h"
+#include "hdb/sound.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-cinematic.cpp b/engines/hdb/ai-cinematic.cpp
index 77ad8447bd..93ed89824d 100644
--- a/engines/hdb/ai-cinematic.cpp
+++ b/engines/hdb/ai-cinematic.cpp
@@ -24,6 +24,8 @@
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
 #include "hdb/map.h"
+#include "hdb/sound.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp
index 3fcb78e798..147dc5c9fc 100644
--- a/engines/hdb/ai-funcs.cpp
+++ b/engines/hdb/ai-funcs.cpp
@@ -27,6 +27,8 @@
 #include "hdb/lua-script.h"
 #include "hdb/map.h"
 #include "hdb/mpc.h"
+#include "hdb/sound.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-init.cpp b/engines/hdb/ai-init.cpp
index f7178420eb..e8325fb919 100644
--- a/engines/hdb/ai-init.cpp
+++ b/engines/hdb/ai-init.cpp
@@ -24,6 +24,7 @@
 #include "hdb/gfx.h"
 #include "hdb/map.h"
 #include "hdb/mpc.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-inventory.cpp b/engines/hdb/ai-inventory.cpp
index 7449697611..c8133b7d21 100644
--- a/engines/hdb/ai-inventory.cpp
+++ b/engines/hdb/ai-inventory.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/sound.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-lists.cpp b/engines/hdb/ai-lists.cpp
index 6af61fadc5..f29104f257 100644
--- a/engines/hdb/ai-lists.cpp
+++ b/engines/hdb/ai-lists.cpp
@@ -25,6 +25,8 @@
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
 #include "hdb/map.h"
+#include "hdb/sound.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-player.cpp b/engines/hdb/ai-player.cpp
index 16b6055770..e4b54b921e 100644
--- a/engines/hdb/ai-player.cpp
+++ b/engines/hdb/ai-player.cpp
@@ -23,10 +23,12 @@
 #include "hdb/hdb.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
+#include "hdb/sound.h"
 #include "hdb/menu.h"
 #include "hdb/lua-script.h"
 #include "hdb/map.h"
 #include "hdb/mpc.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-player.h b/engines/hdb/ai-player.h
index 0ab9c162c9..b878782030 100644
--- a/engines/hdb/ai-player.h
+++ b/engines/hdb/ai-player.h
@@ -23,8 +23,6 @@
 #ifndef HDB_AI_PLAYER_H
 #define HDB_AI_PLAYER_H
 
-#include "hdb/hdb.h"
-
 namespace HDB {
 
 void aiPlayerInit(AIEntity *e);
diff --git a/engines/hdb/ai-use.cpp b/engines/hdb/ai-use.cpp
index e57ef7c7f5..6f04728622 100644
--- a/engines/hdb/ai-use.cpp
+++ b/engines/hdb/ai-use.cpp
@@ -22,6 +22,8 @@
 
 #include "hdb/hdb.h"
 #include "hdb/map.h"
+#include "hdb/sound.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-waypoint.cpp b/engines/hdb/ai-waypoint.cpp
index bab7ee8496..86480eb10e 100644
--- a/engines/hdb/ai-waypoint.cpp
+++ b/engines/hdb/ai-waypoint.cpp
@@ -23,6 +23,7 @@
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
 #include "hdb/map.h"
+#include "hdb/sound.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/gfx.cpp b/engines/hdb/gfx.cpp
index 643451d768..842bdcf4a1 100644
--- a/engines/hdb/gfx.cpp
+++ b/engines/hdb/gfx.cpp
@@ -28,6 +28,7 @@
 #include "hdb/gfx.h"
 #include "hdb/input.h"
 #include "hdb/mpc.h"
+#include "hdb/sound.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/hdb.cpp b/engines/hdb/hdb.cpp
index ebe8b2878b..4fad19c812 100644
--- a/engines/hdb/hdb.cpp
+++ b/engines/hdb/hdb.cpp
@@ -36,8 +36,10 @@
 #include "hdb/input.h"
 #include "hdb/lua-script.h"
 #include "hdb/map.h"
+#include "hdb/sound.h"
 #include "hdb/menu.h"
 #include "hdb/mpc.h"
+#include "hdb/window.h"
 
 #define CHEAT_PATCHES 0
 
diff --git a/engines/hdb/hdb.h b/engines/hdb/hdb.h
index 82d028b026..b489f3d361 100644
--- a/engines/hdb/hdb.h
+++ b/engines/hdb/hdb.h
@@ -50,6 +50,8 @@ class Map;
 class Menu;
 class Tile;
 class Picture;
+class Sound;
+class Window;
 
 enum {
 	kScreenWidth = 640,
@@ -74,8 +76,7 @@ enum {
 
 #include "hdb/ai.h"
 #include "hdb/ai-player.h"
-#include "hdb/sound.h"
-#include "hdb/window.h"
+//#include "hdb/window.h"
 
 struct ADGameDescription;
 
diff --git a/engines/hdb/input.cpp b/engines/hdb/input.cpp
index 41438589b2..df2f8e8284 100644
--- a/engines/hdb/input.cpp
+++ b/engines/hdb/input.cpp
@@ -24,7 +24,9 @@
 #include "hdb/gfx.h"
 #include "hdb/input.h"
 #include "hdb/map.h"
+#include "hdb/sound.h"
 #include "hdb/menu.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/lua-script.cpp b/engines/hdb/lua-script.cpp
index 5216aa3509..71de7b1db3 100644
--- a/engines/hdb/lua-script.cpp
+++ b/engines/hdb/lua-script.cpp
@@ -31,6 +31,8 @@
 #include "hdb/gfx.h"
 #include "hdb/map.h"
 #include "hdb/mpc.h"
+#include "hdb/sound.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/menu.cpp b/engines/hdb/menu.cpp
index 24eaf25b86..d77f0d8856 100644
--- a/engines/hdb/menu.cpp
+++ b/engines/hdb/menu.cpp
@@ -24,6 +24,7 @@
 #include "hdb/gfx.h"
 #include "hdb/input.h"
 #include "hdb/lua-script.h"
+#include "hdb/sound.h"
 #include "hdb/menu.h"
 #include "hdb/map.h"
 #include "hdb/mpc.h"
diff --git a/engines/hdb/saveload.cpp b/engines/hdb/saveload.cpp
index ca65dc1921..01432b6164 100644
--- a/engines/hdb/saveload.cpp
+++ b/engines/hdb/saveload.cpp
@@ -24,6 +24,8 @@
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
 #include "hdb/map.h"
+#include "hdb/sound.h"
+#include "hdb/window.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/sound.cpp b/engines/hdb/sound.cpp
index 5fdd016edf..cd81ab4318 100644
--- a/engines/hdb/sound.cpp
+++ b/engines/hdb/sound.cpp
@@ -22,6 +22,7 @@
 
 #include "hdb/hdb.h"
 #include "hdb/mpc.h"
+#include "hdb/sound.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/window.cpp b/engines/hdb/window.cpp
index 87810f63e8..26d8682343 100644
--- a/engines/hdb/window.cpp
+++ b/engines/hdb/window.cpp
@@ -25,6 +25,8 @@
 #include "hdb/lua-script.h"
 #include "hdb/map.h"
 #include "hdb/mpc.h"
+#include "hdb/sound.h"
+#include "hdb/window.h"
 
 namespace HDB {