HDB: Reduce header dependency

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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

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"

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"

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 {

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"

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"

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"

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"

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"

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"