HDB: Reduce header dependency

12 files changed, 16 insertions, 2 deletions

diff --git a/engines/hdb/ai-bots.cpp b/engines/hdb/ai-bots.cpp
index 16a52abd8d..83c96c4ef0 100644
--- a/engines/hdb/ai-bots.cpp
+++ b/engines/hdb/ai-bots.cpp
@@ -22,6 +22,7 @@
 
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
+#include "hdb/lua-script.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/ai-cinematic.cpp b/engines/hdb/ai-cinematic.cpp
index 2c05ad1eba..95708541d6 100644
--- a/engines/hdb/ai-cinematic.cpp
+++ b/engines/hdb/ai-cinematic.cpp
@@ -22,6 +22,7 @@
 
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
+#include "hdb/lua-script.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp
index 82f9b3bb91..719dca25b6 100644
--- a/engines/hdb/ai-funcs.cpp
+++ b/engines/hdb/ai-funcs.cpp
@@ -23,6 +23,8 @@
 #include "hdb/hdb.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
+#include "hdb/input.h"
+#include "hdb/lua-script.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/ai-lists.cpp b/engines/hdb/ai-lists.cpp
index 326d18ca9a..4941a3fb87 100644
--- a/engines/hdb/ai-lists.cpp
+++ b/engines/hdb/ai-lists.cpp
@@ -23,6 +23,7 @@
 #include "hdb/hdb.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
+#include "hdb/lua-script.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/ai-player.cpp b/engines/hdb/ai-player.cpp
index 9f32651e27..5992385bb1 100644
--- a/engines/hdb/ai-player.cpp
+++ b/engines/hdb/ai-player.cpp
@@ -24,6 +24,7 @@
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
 #include "hdb/menu.h"
+#include "hdb/lua-script.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/gfx.cpp b/engines/hdb/gfx.cpp
index 2c4423ca68..643451d768 100644
--- a/engines/hdb/gfx.cpp
+++ b/engines/hdb/gfx.cpp
@@ -26,6 +26,7 @@
 #include "hdb/hdb.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
+#include "hdb/input.h"
 #include "hdb/mpc.h"
 
 namespace HDB {
diff --git a/engines/hdb/hdb.cpp b/engines/hdb/hdb.cpp
index cf8d579036..36d15a355f 100644
--- a/engines/hdb/hdb.cpp
+++ b/engines/hdb/hdb.cpp
@@ -33,6 +33,8 @@
 #include "hdb/hdb.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
+#include "hdb/input.h"
+#include "hdb/lua-script.h"
 #include "hdb/menu.h"
 #include "hdb/mpc.h"
 
diff --git a/engines/hdb/hdb.h b/engines/hdb/hdb.h
index 7359024707..aeaf0221a6 100644
--- a/engines/hdb/hdb.h
+++ b/engines/hdb/hdb.h
@@ -44,6 +44,8 @@
 namespace HDB {
 class FileMan;
 class Gfx;
+class Input;
+class LuaScript;
 class Menu;
 class Tile;
 class Picture;
@@ -71,8 +73,6 @@ enum {
 
 #include "hdb/ai.h"
 #include "hdb/ai-player.h"
-#include "hdb/input.h"
-#include "hdb/lua-script.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 b9ab6fe624..92f56b5a51 100644
--- a/engines/hdb/input.cpp
+++ b/engines/hdb/input.cpp
@@ -22,6 +22,7 @@
 
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
+#include "hdb/input.h"
 #include "hdb/menu.h"
 
 namespace HDB {
diff --git a/engines/hdb/menu.cpp b/engines/hdb/menu.cpp
index 639adb68d3..a191d88cf9 100644
--- a/engines/hdb/menu.cpp
+++ b/engines/hdb/menu.cpp
@@ -22,6 +22,8 @@
 
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
+#include "hdb/input.h"
+#include "hdb/lua-script.h"
 #include "hdb/menu.h"
 #include "hdb/mpc.h"
 
diff --git a/engines/hdb/saveload.cpp b/engines/hdb/saveload.cpp
index 4f5fd06b28..e2f264e198 100644
--- a/engines/hdb/saveload.cpp
+++ b/engines/hdb/saveload.cpp
@@ -22,6 +22,7 @@
 
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
+#include "hdb/lua-script.h"
 
 namespace HDB {
 
diff --git a/engines/hdb/window.cpp b/engines/hdb/window.cpp
index 3499077bea..38100ef678 100644
--- a/engines/hdb/window.cpp
+++ b/engines/hdb/window.cpp
@@ -22,6 +22,7 @@
 
 #include "hdb/hdb.h"
 #include "hdb/gfx.h"
+#include "hdb/lua-script.h"
 #include "hdb/mpc.h"
 
 namespace HDB {