HDB: Reduce header dependency

17 files changed, 42 insertions, 25 deletions

diff --git a/engines/hdb/ai-bots.cpp b/engines/hdb/ai-bots.cpp
index b9e761b3c3..16a52abd8d 100644
--- a/engines/hdb/ai-bots.cpp
+++ b/engines/hdb/ai-bots.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/ai-cinematic.cpp b/engines/hdb/ai-cinematic.cpp
index 05986ca656..2c05ad1eba 100644
--- a/engines/hdb/ai-cinematic.cpp
+++ b/engines/hdb/ai-cinematic.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp
index d8d2b71550..5a35e2a723 100644
--- a/engines/hdb/ai-funcs.cpp
+++ b/engines/hdb/ai-funcs.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/ai-init.cpp b/engines/hdb/ai-init.cpp
index f66a1d66b1..bcc38f287f 100644
--- a/engines/hdb/ai-init.cpp
+++ b/engines/hdb/ai-init.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/ai-lists.cpp b/engines/hdb/ai-lists.cpp
index b2f3a6949e..2fc2112c31 100644
--- a/engines/hdb/ai-lists.cpp
+++ b/engines/hdb/ai-lists.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-player.cpp b/engines/hdb/ai-player.cpp
index dbd443996c..84927262b0 100644
--- a/engines/hdb/ai-player.cpp
+++ b/engines/hdb/ai-player.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 #include "hdb/menu.h"
 #include "hdb/mpc.h"
 
diff --git a/engines/hdb/ai-waypoint.cpp b/engines/hdb/ai-waypoint.cpp
index 312c2cf90e..eed404eb03 100644
--- a/engines/hdb/ai-waypoint.cpp
+++ b/engines/hdb/ai-waypoint.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/gfx.cpp b/engines/hdb/gfx.cpp
index 873ca723f0..5bb557fa74 100644
--- a/engines/hdb/gfx.cpp
+++ b/engines/hdb/gfx.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/gfx.h b/engines/hdb/gfx.h
index 26b08108c7..9805fc9e6b 100644
--- a/engines/hdb/gfx.h
+++ b/engines/hdb/gfx.h
@@ -29,28 +29,6 @@
 
 namespace HDB {
 
-enum {
-	kScreenWidth = 640,
-	kScreenHeight = 480,
-	kScreenDrawWidth = (kScreenWidth - 160), // visible pixels wide
-	kScreenDrawHeight = 480,
-	kTileWidth = 32,
-	kTileHeight = 32,
-	kMaxSkies = 10,
-	kNum3DStars = 300,
-	kFontSpace = 5,
-	kFontIncrement = 1,
-	kGameFPS = 60,
-	kAnimFrameDelay = kGameFPS / 30,
-	kAnimSlowFrames = kAnimFrameDelay * 10,
-	kAnimMediumFrames = kAnimFrameDelay * 6,
-	kAnimFastFrames = kAnimFrameDelay * 2,
-	kProgressY = (kScreenHeight - 64)
-};
-
-class Tile;
-class Picture;
-
 struct TileLookup {
 	const char *filename;
 	Tile *tData;
diff --git a/engines/hdb/hdb.cpp b/engines/hdb/hdb.cpp
index 15240f6c9c..f2f20a28c6 100644
--- a/engines/hdb/hdb.cpp
+++ b/engines/hdb/hdb.cpp
@@ -31,6 +31,7 @@
 #include "common/memstream.h"
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 #include "hdb/console.h"
 #include "hdb/menu.h"
 #include "hdb/mpc.h"
diff --git a/engines/hdb/hdb.h b/engines/hdb/hdb.h
index 29f46dbe51..af04c3ba26 100644
--- a/engines/hdb/hdb.h
+++ b/engines/hdb/hdb.h
@@ -46,7 +46,33 @@
 #include "engines/util.h"
 #include "console.h"
 
-#include "hdb/gfx.h"
+namespace HDB {
+class Tile;
+class Picture;
+class Menu;
+class Gfx;
+
+enum {
+	kScreenWidth = 640,
+	kScreenHeight = 480,
+	kScreenDrawWidth = (kScreenWidth - 160), // visible pixels wide
+	kScreenDrawHeight = 480,
+	kTileWidth = 32,
+	kTileHeight = 32,
+	kMaxSkies = 10,
+	kNum3DStars = 300,
+	kFontSpace = 5,
+	kFontIncrement = 1,
+	kGameFPS = 60,
+	kAnimFrameDelay = kGameFPS / 30,
+	kAnimSlowFrames = kAnimFrameDelay * 10,
+	kAnimMediumFrames = kAnimFrameDelay * 6,
+	kAnimFastFrames = kAnimFrameDelay * 2,
+	kProgressY = (kScreenHeight - 64)
+};
+
+}
+
 #include "hdb/ai.h"
 #include "hdb/ai-player.h"
 #include "hdb/file-manager.h"
@@ -60,8 +86,6 @@ struct ADGameDescription;
 
 namespace HDB {
 
-class Menu;
-
 enum GameFeatures {
 	ADGF_TALKIE = 1 << 0
 };
diff --git a/engines/hdb/input.cpp b/engines/hdb/input.cpp
index e345032368..b9ab6fe624 100644
--- a/engines/hdb/input.cpp
+++ b/engines/hdb/input.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 #include "hdb/menu.h"
 
 namespace HDB {
diff --git a/engines/hdb/lua-script.cpp b/engines/hdb/lua-script.cpp
index 83eb87aef8..b35caa1831 100644
--- a/engines/hdb/lua-script.cpp
+++ b/engines/hdb/lua-script.cpp
@@ -26,6 +26,7 @@
 #include "common/debug.h"
 
 #include "hdb/lua-script.h"
+#include "hdb/gfx.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/map.cpp b/engines/hdb/map.cpp
index 4467a9f122..80db4983d1 100644
--- a/engines/hdb/map.cpp
+++ b/engines/hdb/map.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/menu.cpp b/engines/hdb/menu.cpp
index d65402b5e3..639adb68d3 100644
--- a/engines/hdb/menu.cpp
+++ b/engines/hdb/menu.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 #include "hdb/menu.h"
 #include "hdb/mpc.h"
 
diff --git a/engines/hdb/saveload.cpp b/engines/hdb/saveload.cpp
index ef086f42ab..4f5fd06b28 100644
--- a/engines/hdb/saveload.cpp
+++ b/engines/hdb/saveload.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/window.cpp b/engines/hdb/window.cpp
index 52442bd243..3499077bea 100644
--- a/engines/hdb/window.cpp
+++ b/engines/hdb/window.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/gfx.h"
 #include "hdb/mpc.h"
 
 namespace HDB {