Removed some of the #includes from sword2.h

svn-id: r12739

37 files changed, 123 insertions, 10 deletions

diff --git a/sword2/anims.cpp b/sword2/anims.cpp
index 7d7826956a..6614ce6e82 100644
--- a/sword2/anims.cpp
+++ b/sword2/anims.cpp
@@ -27,8 +27,14 @@
 #include "common/file.h"
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/controls.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
 #include "sword2/driver/animation.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 
diff --git a/sword2/build_display.cpp b/sword2/build_display.cpp
index fd31e877d0..3466149f96 100644
--- a/sword2/build_display.cpp
+++ b/sword2/build_display.cpp
@@ -23,8 +23,13 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 
diff --git a/sword2/console.cpp b/sword2/console.cpp
index 96337649fa..6f1d67f2d0 100644
--- a/sword2/console.cpp
+++ b/sword2/console.cpp
@@ -20,6 +20,12 @@
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/console.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 #include "common/debugger.cpp"
 
diff --git a/sword2/controls.cpp b/sword2/controls.cpp
index 037eb2b774..a59f38d707 100644
--- a/sword2/controls.cpp
+++ b/sword2/controls.cpp
@@ -18,9 +18,15 @@
  */
 
 #include "common/stdafx.h"
+#include "common/rect.h"
 #include "common/config-manager.h"
 #include "sword2/sword2.h"
+#include "sword2/controls.h"
 #include "sword2/defs.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 #define	MAX_STRING_LEN		64	// 20 was too low; better to be safe ;)
 #define CHARACTER_OVERLAP	 2	// overlap characters by 3 pixels
diff --git a/sword2/debug.cpp b/sword2/debug.cpp
index 73eb659075..df8d33f2f4 100644
--- a/sword2/debug.cpp
+++ b/sword2/debug.cpp
@@ -19,7 +19,12 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
 #include "sword2/defs.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 
diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp
index 936b809d7e..8cdb378aef 100644
--- a/sword2/driver/_mouse.cpp
+++ b/sword2/driver/_mouse.cpp
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp
index 2f097210fe..1b231d5051 100644
--- a/sword2/driver/animation.cpp
+++ b/sword2/driver/animation.cpp
@@ -21,7 +21,10 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/maketext.h"
 #include "sword2/driver/animation.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 #include "sword2/driver/menu.h"
 #include "sword2/driver/render.h"
 
diff --git a/sword2/driver/animation.h b/sword2/driver/animation.h
index 03d4fb0283..a7371fcd69 100644
--- a/sword2/driver/animation.h
+++ b/sword2/driver/animation.h
@@ -22,6 +22,8 @@
 #ifndef ANIMATION_H
 #define ANIMATION_H
 
+#include "sound/mixer.h"
+
 // Uncomment this if you are using libmpeg2 0.3.1.
 // #define USE_MPEG2_0_3_1
 
diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp
index b3e4814df9..f4462f695f 100644
--- a/sword2/driver/d_draw.cpp
+++ b/sword2/driver/d_draw.cpp
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 #include "sword2/driver/menu.h"
 #include "sword2/driver/render.h"
 
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index 83af1fc3a2..4277e525da 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -34,8 +34,10 @@
 
 #include "common/stdafx.h"
 #include "common/file.h"
-#include "sword2/sword2.h"
 #include "sound/rate.h"
+#include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 
diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp
index 44b695dc86..b1534e686b 100644
--- a/sword2/driver/menu.cpp
+++ b/sword2/driver/menu.cpp
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 #include "sword2/driver/render.h"
 
 namespace Sword2 {
diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp
index f6fbf15770..2d28d517eb 100644
--- a/sword2/driver/palette.cpp
+++ b/sword2/driver/palette.cpp
@@ -18,9 +18,8 @@
  */
 
 #include "common/stdafx.h"
-// #include "common/util.h"
-// #include "base/engine.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 
diff --git a/sword2/driver/rdwin.cpp b/sword2/driver/rdwin.cpp
index d468f7c84a..28f00003d8 100644
--- a/sword2/driver/rdwin.cpp
+++ b/sword2/driver/rdwin.cpp
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 #include "sword2/driver/menu.h"
 
 namespace Sword2 {
diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp
index 4674aa80fd..b467266a08 100644
--- a/sword2/driver/render.cpp
+++ b/sword2/driver/render.cpp
@@ -20,6 +20,7 @@
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
 #include "sword2/driver/animation.h"
+#include "sword2/driver/d_draw.h"
 #include "sword2/driver/menu.h"
 #include "sword2/driver/render.h"
 
diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp
index 5cc8cd5e89..f13eb877fd 100644
--- a/sword2/driver/sprite.cpp
+++ b/sword2/driver/sprite.cpp
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 
diff --git a/sword2/events.cpp b/sword2/events.cpp
index 5a55851337..ad11bad8e4 100644
--- a/sword2/events.cpp
+++ b/sword2/events.cpp
@@ -21,6 +21,8 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 
diff --git a/sword2/function.cpp b/sword2/function.cpp
index f74b2b6941..ea09e1de91 100644
--- a/sword2/function.cpp
+++ b/sword2/function.cpp
@@ -22,6 +22,11 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 
diff --git a/sword2/icons.cpp b/sword2/icons.cpp
index 9d82d43c66..d09043a99e 100644
--- a/sword2/icons.cpp
+++ b/sword2/icons.cpp
@@ -21,6 +21,9 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 
diff --git a/sword2/interpreter.cpp b/sword2/interpreter.cpp
index ee31c490f1..31803c065e 100644
--- a/sword2/interpreter.cpp
+++ b/sword2/interpreter.cpp
@@ -21,6 +21,7 @@
 #include "common/util.h"
 #include "sword2/sword2.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
 
 namespace Sword2 {
 
diff --git a/sword2/layers.cpp b/sword2/layers.cpp
index 06bf5ccba3..cf3e606e87 100644
--- a/sword2/layers.cpp
+++ b/sword2/layers.cpp
@@ -27,6 +27,9 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 
diff --git a/sword2/logic.cpp b/sword2/logic.cpp
index 3f67dfaa69..f7dab314b7 100644
--- a/sword2/logic.cpp
+++ b/sword2/logic.cpp
@@ -20,7 +20,10 @@
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/console.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
 
 #define LEVEL (_curObjectHub->logic_level)
 
diff --git a/sword2/maketext.cpp b/sword2/maketext.cpp
index d489422263..3555e46a1a 100644
--- a/sword2/maketext.cpp
+++ b/sword2/maketext.cpp
@@ -49,6 +49,9 @@
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 
diff --git a/sword2/mem_view.cpp b/sword2/mem_view.cpp
index 955b86db7c..7cc70b308f 100644
--- a/sword2/mem_view.cpp
+++ b/sword2/mem_view.cpp
@@ -19,6 +19,8 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
+#include "sword2/resman.h"
 
 #define Debug_Printf _vm->_debugger->DebugPrintf
 
diff --git a/sword2/memory.cpp b/sword2/memory.cpp
index b21bf1b621..4d45e45682 100644
--- a/sword2/memory.cpp
+++ b/sword2/memory.cpp
@@ -36,6 +36,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 
diff --git a/sword2/mouse.cpp b/sword2/mouse.cpp
index cc02502912..cc25c35244 100644
--- a/sword2/mouse.cpp
+++ b/sword2/mouse.cpp
@@ -19,8 +19,15 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
+#include "sword2/controls.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 
diff --git a/sword2/protocol.cpp b/sword2/protocol.cpp
index 59445ac6a2..85a2bc35e2 100644
--- a/sword2/protocol.cpp
+++ b/sword2/protocol.cpp
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 
diff --git a/sword2/resman.cpp b/sword2/resman.cpp
index 77b2d4a6a1..02adf6e781 100644
--- a/sword2/resman.cpp
+++ b/sword2/resman.cpp
@@ -20,7 +20,11 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
 #include "sword2/defs.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 #define Debug_Printf _vm->_debugger->DebugPrintf
 
diff --git a/sword2/router.cpp b/sword2/router.cpp
index e91a922b56..cf75d75762 100644
--- a/sword2/router.cpp
+++ b/sword2/router.cpp
@@ -76,6 +76,9 @@
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/resman.h"
+#include "sword2/router.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 
diff --git a/sword2/save_rest.cpp b/sword2/save_rest.cpp
index d950e326d2..0671c79d3f 100644
--- a/sword2/save_rest.cpp
+++ b/sword2/save_rest.cpp
@@ -30,6 +30,8 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 
diff --git a/sword2/scroll.cpp b/sword2/scroll.cpp
index ae7098f93b..744073a0a7 100644
--- a/sword2/scroll.cpp
+++ b/sword2/scroll.cpp
@@ -21,6 +21,8 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 
diff --git a/sword2/sound.cpp b/sword2/sound.cpp
index 4d6e7b4a21..90e1356e65 100644
--- a/sword2/sound.cpp
+++ b/sword2/sound.cpp
@@ -32,6 +32,9 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 
diff --git a/sword2/speech.cpp b/sword2/speech.cpp
index f053b6550d..6726856fd3 100644
--- a/sword2/speech.cpp
+++ b/sword2/speech.cpp
@@ -20,8 +20,15 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
+#include "sword2/controls.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 
diff --git a/sword2/startup.cpp b/sword2/startup.cpp
index eae1a99f1c..182548fedf 100644
--- a/sword2/startup.cpp
+++ b/sword2/startup.cpp
@@ -20,6 +20,11 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_sound.h"
 
 #define Debug_Printf _vm->_debugger->DebugPrintf
 
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index 5d6a092014..26ec549430 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -23,7 +23,14 @@
 #include "base/plugins.h"
 #include "common/config-manager.h"
 #include "sword2/sword2.h"
+#include "sword2/console.h"
+#include "sword2/controls.h"
 #include "sword2/defs.h"
+#include "sword2/logic.h"
+#include "sword2/maketext.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 #ifdef _WIN32_WCE
 extern bool isSmartphone(void);
diff --git a/sword2/sword2.h b/sword2/sword2.h
index 791fe56082..91c78512ff 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -21,20 +21,16 @@
 #define	_SWORD2
 
 #include "base/engine.h"
+#include "common/util.h"
+
 #include "sword2/driver/driver96.h"
-#include "sword2/driver/d_sound.h"
-#include "sword2/driver/d_draw.h"
 #include "sword2/build_display.h"
-#include "sword2/console.h"
-#include "sword2/controls.h"
+#include "sword2/header.h"
 #include "sword2/icons.h"
 #include "sword2/layers.h"
-#include "sword2/logic.h"
-#include "sword2/maketext.h"
 #include "sword2/memory.h"
 #include "sword2/mouse.h"
 #include "sword2/object.h"
-#include "sword2/resman.h"
 #include "sword2/save_rest.h"
 #include "sword2/sound.h"
 
@@ -46,6 +42,14 @@ enum {
 	GF_DEMO	= 1 << 0
 };
 
+class ResourceManager;
+class Sound;
+class Graphics;
+class Logic;
+class FontRenderer;
+class Gui;
+class Debugger;
+
 class Sword2Engine : public Engine {
 private:
 	uint32 _bootParam;
diff --git a/sword2/sync.cpp b/sword2/sync.cpp
index c67dd77e79..0475bbd08b 100644
--- a/sword2/sync.cpp
+++ b/sword2/sync.cpp
@@ -21,6 +21,8 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
 
 namespace Sword2 {
 
diff --git a/sword2/walker.cpp b/sword2/walker.cpp
index cb5c966236..df6206b992 100644
--- a/sword2/walker.cpp
+++ b/sword2/walker.cpp
@@ -26,6 +26,9 @@
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
+#include "sword2/logic.h"
+#include "sword2/resman.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {