HDB: Reduce header dependency

16 files changed, 16 insertions, 1 deletions

diff --git a/engines/hdb/ai-bots.cpp b/engines/hdb/ai-bots.cpp
index 83c96c4ef0..cd031d4359 100644
--- a/engines/hdb/ai-bots.cpp
+++ b/engines/hdb/ai-bots.cpp
@@ -23,6 +23,7 @@
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
+#include "hdb/map.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/ai-cinematic.cpp b/engines/hdb/ai-cinematic.cpp
index 95708541d6..77ad8447bd 100644
--- a/engines/hdb/ai-cinematic.cpp
+++ b/engines/hdb/ai-cinematic.cpp
@@ -23,6 +23,7 @@
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
+#include "hdb/map.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp
index 719dca25b6..3fcb78e798 100644
--- a/engines/hdb/ai-funcs.cpp
+++ b/engines/hdb/ai-funcs.cpp
@@ -25,6 +25,7 @@
 #include "hdb/gfx.h"
 #include "hdb/input.h"
 #include "hdb/lua-script.h"
+#include "hdb/map.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/ai-init.cpp b/engines/hdb/ai-init.cpp
index bcc38f287f..f7178420eb 100644
--- a/engines/hdb/ai-init.cpp
+++ b/engines/hdb/ai-init.cpp
@@ -22,6 +22,7 @@
 
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
+#include "hdb/map.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/ai-lists.cpp b/engines/hdb/ai-lists.cpp
index 4941a3fb87..6af61fadc5 100644
--- a/engines/hdb/ai-lists.cpp
+++ b/engines/hdb/ai-lists.cpp
@@ -24,6 +24,7 @@
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
+#include "hdb/map.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-player.cpp b/engines/hdb/ai-player.cpp
index 5992385bb1..16b6055770 100644
--- a/engines/hdb/ai-player.cpp
+++ b/engines/hdb/ai-player.cpp
@@ -25,6 +25,7 @@
 #include "hdb/gfx.h"
 #include "hdb/menu.h"
 #include "hdb/lua-script.h"
+#include "hdb/map.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/ai-use.cpp b/engines/hdb/ai-use.cpp
index 21c331bb2a..e57ef7c7f5 100644
--- a/engines/hdb/ai-use.cpp
+++ b/engines/hdb/ai-use.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/map.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-waypoint.cpp b/engines/hdb/ai-waypoint.cpp
index eed404eb03..bab7ee8496 100644
--- a/engines/hdb/ai-waypoint.cpp
+++ b/engines/hdb/ai-waypoint.cpp
@@ -22,6 +22,7 @@
 
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
+#include "hdb/map.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/hdb.cpp b/engines/hdb/hdb.cpp
index 36d15a355f..ebe8b2878b 100644
--- a/engines/hdb/hdb.cpp
+++ b/engines/hdb/hdb.cpp
@@ -35,6 +35,7 @@
 #include "hdb/gfx.h"
 #include "hdb/input.h"
 #include "hdb/lua-script.h"
+#include "hdb/map.h"
 #include "hdb/menu.h"
 #include "hdb/mpc.h"
 
diff --git a/engines/hdb/hdb.h b/engines/hdb/hdb.h
index aeaf0221a6..82d028b026 100644
--- a/engines/hdb/hdb.h
+++ b/engines/hdb/hdb.h
@@ -46,6 +46,7 @@ class FileMan;
 class Gfx;
 class Input;
 class LuaScript;
+class Map;
 class Menu;
 class Tile;
 class Picture;
@@ -73,7 +74,6 @@ enum {
 
 #include "hdb/ai.h"
 #include "hdb/ai-player.h"
-#include "hdb/map.h"
 #include "hdb/sound.h"
 #include "hdb/window.h"
 
diff --git a/engines/hdb/input.cpp b/engines/hdb/input.cpp
index 92f56b5a51..41438589b2 100644
--- a/engines/hdb/input.cpp
+++ b/engines/hdb/input.cpp
@@ -23,6 +23,7 @@
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
 #include "hdb/input.h"
+#include "hdb/map.h"
 #include "hdb/menu.h"
 
 namespace HDB {
diff --git a/engines/hdb/lua-script.cpp b/engines/hdb/lua-script.cpp
index 0160f7f4e0..5216aa3509 100644
--- a/engines/hdb/lua-script.cpp
+++ b/engines/hdb/lua-script.cpp
@@ -29,6 +29,7 @@
 #include "hdb/file-manager.h"
 #include "hdb/lua-script.h"
 #include "hdb/gfx.h"
+#include "hdb/map.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/map.cpp b/engines/hdb/map.cpp
index 530706938d..12c8e01fc7 100644
--- a/engines/hdb/map.cpp
+++ b/engines/hdb/map.cpp
@@ -23,6 +23,7 @@
 #include "hdb/hdb.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
+#include "hdb/map.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/menu.cpp b/engines/hdb/menu.cpp
index a191d88cf9..24eaf25b86 100644
--- a/engines/hdb/menu.cpp
+++ b/engines/hdb/menu.cpp
@@ -25,6 +25,7 @@
 #include "hdb/input.h"
 #include "hdb/lua-script.h"
 #include "hdb/menu.h"
+#include "hdb/map.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/saveload.cpp b/engines/hdb/saveload.cpp
index e2f264e198..ca65dc1921 100644
--- a/engines/hdb/saveload.cpp
+++ b/engines/hdb/saveload.cpp
@@ -23,6 +23,7 @@
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
+#include "hdb/map.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/window.cpp b/engines/hdb/window.cpp
index 38100ef678..87810f63e8 100644
--- a/engines/hdb/window.cpp
+++ b/engines/hdb/window.cpp
@@ -23,6 +23,7 @@
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
+#include "hdb/map.h"
 #include "hdb/mpc.h"
 
 namespace HDB {