19 files changed, 20 insertions, 4 deletions
diff --git a/engines/hdb/ai-bots.cpp b/engines/hdb/ai-bots.cpp
index ebe200a9ae..fd9ee27bf3 100644
--- a/engines/hdb/ai-bots.cpp
+++ b/engines/hdb/ai-bots.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/ai-player.h"
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
diff --git a/engines/hdb/ai-cinematic.cpp b/engines/hdb/ai-cinematic.cpp
index 93ed89824d..80226bee44 100644
--- a/engines/hdb/ai-cinematic.cpp
+++ b/engines/hdb/ai-cinematic.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
 #include "hdb/map.h"
diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp
index 78ab996f92..aa0876ff4f 100644
--- a/engines/hdb/ai-funcs.cpp
+++ b/engines/hdb/ai-funcs.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/ai-player.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
diff --git a/engines/hdb/ai-init.cpp b/engines/hdb/ai-init.cpp
index 3200e6289c..3ad935cea4 100644
--- a/engines/hdb/ai-init.cpp
+++ b/engines/hdb/ai-init.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/ai-player.h"
 #include "hdb/gfx.h"
 #include "hdb/map.h"
diff --git a/engines/hdb/ai-inventory.cpp b/engines/hdb/ai-inventory.cpp
index c8133b7d21..dbb7f3dab3 100644
--- a/engines/hdb/ai-inventory.cpp
+++ b/engines/hdb/ai-inventory.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/sound.h"
 #include "hdb/window.h"
 
diff --git a/engines/hdb/ai-lists.cpp b/engines/hdb/ai-lists.cpp
index e24b4f80b5..638d351fe0 100644
--- a/engines/hdb/ai-lists.cpp
+++ b/engines/hdb/ai-lists.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/ai-player.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
diff --git a/engines/hdb/ai-player.cpp b/engines/hdb/ai-player.cpp
index 8dd814993a..591a9ecc32 100644
--- a/engines/hdb/ai-player.cpp
+++ b/engines/hdb/ai-player.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/ai-player.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
diff --git a/engines/hdb/ai-use.cpp b/engines/hdb/ai-use.cpp
index 6f04728622..1b4b08c187 100644
--- a/engines/hdb/ai-use.cpp
+++ b/engines/hdb/ai-use.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/map.h"
 #include "hdb/sound.h"
 #include "hdb/window.h"
diff --git a/engines/hdb/ai-waypoint.cpp b/engines/hdb/ai-waypoint.cpp
index 86480eb10e..cbeb246859 100644
--- a/engines/hdb/ai-waypoint.cpp
+++ b/engines/hdb/ai-waypoint.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/gfx.h"
 #include "hdb/map.h"
 #include "hdb/sound.h"
diff --git a/engines/hdb/ai.h b/engines/hdb/ai.h
index 43f857daad..dfa22bbda7 100644
--- a/engines/hdb/ai.h
+++ b/engines/hdb/ai.h
@@ -23,8 +23,6 @@
 #ifndef HDB_AI_H
 #define HDB_AI_H
 
-#include "common/system.h"
-
 #define STARS_MONKEYSTONE_7			0xfe257d	// magic value in the config file for the unlocking of the Monkeystone secret #7
 #define STARS_MONKEYSTONE_7_FAKE	0x11887e	// fake value that means it hasn't been unlocked
 #define STARS_MONKEYSTONE_14		0x3341fe	// <same> for the Monkeystone #14
diff --git a/engines/hdb/gfx.cpp b/engines/hdb/gfx.cpp
index 842bdcf4a1..7ff3ba8c11 100644
--- a/engines/hdb/gfx.cpp
+++ b/engines/hdb/gfx.cpp
@@ -24,6 +24,7 @@
 #include "common/sinetables.h"
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
 #include "hdb/input.h"
diff --git a/engines/hdb/hdb.cpp b/engines/hdb/hdb.cpp
index cc92ad720e..21141786a7 100644
--- a/engines/hdb/hdb.cpp
+++ b/engines/hdb/hdb.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
 #include "hdb/input.h"
diff --git a/engines/hdb/hdb.h b/engines/hdb/hdb.h
index e75420e389..bef4ac64ca 100644
--- a/engines/hdb/hdb.h
+++ b/engines/hdb/hdb.h
@@ -24,6 +24,7 @@
 #define HDB_HDB_H
 
 #include "common/scummsys.h"
+#include "common/system.h"
 #include "common/array.h"
 #include "common/events.h"
 #include "common/str.h"
@@ -42,6 +43,8 @@
 #include "engines/util.h"
 
 namespace HDB {
+class AI;
+struct AIEntity;
 class FileMan;
 class Gfx;
 class Input;
@@ -74,8 +77,6 @@ enum {
 
 }
 
-#include "hdb/ai.h"
-
 struct ADGameDescription;
 
 namespace HDB {
diff --git a/engines/hdb/input.cpp b/engines/hdb/input.cpp
index df2f8e8284..8c02d1eb79 100644
--- a/engines/hdb/input.cpp
+++ b/engines/hdb/input.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/gfx.h"
 #include "hdb/input.h"
 #include "hdb/map.h"
diff --git a/engines/hdb/lua-script.cpp b/engines/hdb/lua-script.cpp
index 015f855a2f..4d3e0ef821 100644
--- a/engines/hdb/lua-script.cpp
+++ b/engines/hdb/lua-script.cpp
@@ -25,6 +25,7 @@
 #include "common/lua/lualib.h"
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/file-manager.h"
 #include "hdb/lua-script.h"
 #include "hdb/gfx.h"
diff --git a/engines/hdb/map.cpp b/engines/hdb/map.cpp
index 12c8e01fc7..8c2de33e54 100644
--- a/engines/hdb/map.cpp
+++ b/engines/hdb/map.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/file-manager.h"
 #include "hdb/gfx.h"
 #include "hdb/map.h"
diff --git a/engines/hdb/menu.cpp b/engines/hdb/menu.cpp
index d77f0d8856..8d42f9c242 100644
--- a/engines/hdb/menu.cpp
+++ b/engines/hdb/menu.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/gfx.h"
 #include "hdb/input.h"
 #include "hdb/lua-script.h"
diff --git a/engines/hdb/saveload.cpp b/engines/hdb/saveload.cpp
index 01432b6164..02a0fcaeb2 100644
--- a/engines/hdb/saveload.cpp
+++ b/engines/hdb/saveload.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
 #include "hdb/map.h"
diff --git a/engines/hdb/window.cpp b/engines/hdb/window.cpp
index 26d8682343..7809c070c9 100644
--- a/engines/hdb/window.cpp
+++ b/engines/hdb/window.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "hdb/hdb.h"
+#include "hdb/ai.h"
 #include "hdb/gfx.h"
 #include "hdb/lua-script.h"
 #include "hdb/map.h"