Removed includes from sword2.h so that (hopefully) there will eventually be

less dependencies.

svn-id: r20741

34 files changed, 96 insertions, 21 deletions

diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index 2ba5df6792..c40f69acad 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -28,8 +28,10 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/maketext.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 #include "sword2/animation.h"
 
diff --git a/engines/sword2/anims.cpp b/engines/sword2/anims.cpp
index b4b5deecc6..82322282b7 100644
--- a/engines/sword2/anims.cpp
+++ b/engines/sword2/anims.cpp
@@ -30,6 +30,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/screen.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
diff --git a/engines/sword2/console.cpp b/engines/sword2/console.cpp
index b465dc369f..b1c4509cc7 100644
--- a/engines/sword2/console.cpp
+++ b/engines/sword2/console.cpp
@@ -20,14 +20,18 @@
  */
 
 #include "common/stdafx.h"
+#include "common/rect.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/console.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/memory.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 #include "common/debugger.cpp"
diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp
index df1b38c83e..b1eb7ad932 100644
--- a/engines/sword2/controls.cpp
+++ b/engines/sword2/controls.cpp
@@ -26,9 +26,11 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/controls.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 #define	MAX_STRING_LEN    64	// 20 was too low; better to be safe ;)
diff --git a/engines/sword2/controls.h b/engines/sword2/controls.h
index 688e04752d..5ec48c26dc 100644
--- a/engines/sword2/controls.h
+++ b/engines/sword2/controls.h
@@ -23,6 +23,7 @@
 #define	SWORD2_CONTROL_H
 
 #include "sword2/defs.h"
+#include "sword2/saveload.h"
 
 #define MAX_WIDGETS 25
 
diff --git a/engines/sword2/d_draw.cpp b/engines/sword2/d_draw.cpp
index 7f278996fb..3e23c4a8af 100644
--- a/engines/sword2/d_draw.cpp
+++ b/engines/sword2/d_draw.cpp
@@ -21,8 +21,10 @@
 
 #include "common/stdafx.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
 #include "sword2/mouse.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/debug.cpp b/engines/sword2/debug.cpp
index 53fc200241..42183c06d7 100644
--- a/engines/sword2/debug.cpp
+++ b/engines/sword2/debug.cpp
@@ -20,15 +20,19 @@
  */
 
 #include "common/stdafx.h"
+#include "common/rect.h"
+
 #include "sword2/sword2.h"
-#include "sword2/console.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
+#include "sword2/console.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/memory.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
 #include "sword2/router.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/events.cpp b/engines/sword2/events.cpp
index e8090414aa..c1b5a22232 100644
--- a/engines/sword2/events.cpp
+++ b/engines/sword2/events.cpp
@@ -20,8 +20,10 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 
 namespace Sword2 {
diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp
index a2f41f48b0..b35325f9f9 100644
--- a/engines/sword2/function.cpp
+++ b/engines/sword2/function.cpp
@@ -25,6 +25,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/screen.h"
 #include "sword2/console.h"
 #include "sword2/interpreter.h"
diff --git a/engines/sword2/icons.cpp b/engines/sword2/icons.cpp
index 980c20e3b4..6af244369a 100644
--- a/engines/sword2/icons.cpp
+++ b/engines/sword2/icons.cpp
@@ -21,7 +21,10 @@
 
 #include "common/stdafx.h"
 #include "common/stream.h"
+#include "common/rect.h"
+
 #include "sword2/sword2.h"
+#include "sword2/header.h"
 #include "sword2/defs.h"
 #include "sword2/logic.h"
 #include "sword2/mouse.h"
diff --git a/engines/sword2/icons.h b/engines/sword2/icons.h
index d47e0b2cf4..c5fcb1ccde 100644
--- a/engines/sword2/icons.h
+++ b/engines/sword2/icons.h
@@ -22,20 +22,10 @@
 #ifndef	SWORD2_ICONS_H
 #define	SWORD2_ICONS_H
 
-#define MENU_MASTER_OBJECT	44
-#define TOTAL_subjects		(375 - 256 + 1)	// the speech subject bar
-#define TOTAL_engine_pockets	(15 + 10)	// +10 for overflow
+#error "This file is about to be removed"
 
 namespace Sword2 {
 
-// define these in a script and then register them with the system
-
-struct MenuObject {
-	int32 icon_resource;	// icon graphic graphic
-	int32 luggage_resource;	// luggage icon resource (for attaching to
-				// mouse pointer)
-};
-
 } // End of namespace Sword2
 
 #endif
diff --git a/engines/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp
index 1a6e7080b8..751efbcb42 100644
--- a/engines/sword2/interpreter.cpp
+++ b/engines/sword2/interpreter.cpp
@@ -21,7 +21,9 @@
 
 #include "common/stdafx.h"
 #include "common/util.h"
+
 #include "sword2/sword2.h"
+#include "sword2/header.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
diff --git a/engines/sword2/layers.cpp b/engines/sword2/layers.cpp
index 0b59b5a9b1..e6e997c584 100644
--- a/engines/sword2/layers.cpp
+++ b/engines/sword2/layers.cpp
@@ -28,12 +28,15 @@
 //	up to 2 foreground parallax layers
 
 #include "common/stdafx.h"
+#include "common/rect.h"
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 namespace Sword2 {
diff --git a/engines/sword2/logic.cpp b/engines/sword2/logic.cpp
index c26d5615b9..dcda724a65 100644
--- a/engines/sword2/logic.cpp
+++ b/engines/sword2/logic.cpp
@@ -20,8 +20,10 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/resman.h"
 #include "sword2/router.h"
diff --git a/engines/sword2/maketext.cpp b/engines/sword2/maketext.cpp
index 5edaf5e41e..c4f4f5f99c 100644
--- a/engines/sword2/maketext.cpp
+++ b/engines/sword2/maketext.cpp
@@ -39,11 +39,14 @@
 
 #include "common/stdafx.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/menu.cpp b/engines/sword2/menu.cpp
index 07e00accb6..68435eb526 100644
--- a/engines/sword2/menu.cpp
+++ b/engines/sword2/menu.cpp
@@ -20,10 +20,13 @@
  */
 
 #include "common/stdafx.h"
+#include "common/rect.h"
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/mouse.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/mouse.cpp b/engines/sword2/mouse.cpp
index 81419c39e0..4d3a92465f 100644
--- a/engines/sword2/mouse.cpp
+++ b/engines/sword2/mouse.cpp
@@ -26,10 +26,13 @@
 #include "sword2/console.h"
 #include "sword2/controls.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/mouse.h"
+#include "sword2/object.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 namespace Sword2 {
diff --git a/engines/sword2/mouse.h b/engines/sword2/mouse.h
index 18b8c41dd5..4f4fcdadff 100644
--- a/engines/sword2/mouse.h
+++ b/engines/sword2/mouse.h
@@ -19,15 +19,22 @@
  * $Id$
  */
 
+#include "common/rect.h"
+
 #ifndef SWORD2_MOUSE_H
 #define SWORD2_MOUSE_H
 
+#define MENU_MASTER_OBJECT	44
+
 #define	MAX_SUBJECT_LIST 30	// is that enough?
 
+#define TOTAL_subjects		(375 - 256 + 1)	// the speech subject bar
+#define TOTAL_engine_pockets	(15 + 10)	// +10 for overflow
 #define	TOTAL_mouse_list 50
 
 namespace Sword2 {
 
+class MenuObject;
 struct BuildUnit;
 
 // Menubar defines.
@@ -104,6 +111,14 @@ struct MouseUnit {
 	uint32 ref;
 };
 
+// define these in a script and then register them with the system
+
+struct MenuObject {
+	int32 icon_resource;	// icon graphic graphic
+	int32 luggage_resource;	// luggage icon resource (for attaching to
+				// mouse pointer)
+};
+
 class Mouse {
 private:
 	Sword2Engine *_vm;
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index 847f4808cf..276b0f0f6a 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -28,6 +28,7 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "common/system.h"
+
 #include "sound/mp3.h"
 #include "sound/vorbis.h"
 #include "sound/flac.h"
@@ -36,6 +37,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/resman.h"
 #include "sword2/sound.h"
 
diff --git a/engines/sword2/palette.cpp b/engines/sword2/palette.cpp
index 0b6b7a8ca2..86aebc7684 100644
--- a/engines/sword2/palette.cpp
+++ b/engines/sword2/palette.cpp
@@ -21,10 +21,13 @@
 
 #include "common/stdafx.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/protocol.cpp b/engines/sword2/protocol.cpp
index 23010e27a9..1824aca258 100644
--- a/engines/sword2/protocol.cpp
+++ b/engines/sword2/protocol.cpp
@@ -20,7 +20,9 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
+#include "sword2/header.h"
 #include "sword2/resman.h"
 
 namespace Sword2 {
diff --git a/engines/sword2/rdwin.cpp b/engines/sword2/rdwin.cpp
index 310b66abf7..6184df7671 100644
--- a/engines/sword2/rdwin.cpp
+++ b/engines/sword2/rdwin.cpp
@@ -21,7 +21,9 @@
 
 #include "common/stdafx.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp
index 7387dc8f50..51be644bcd 100644
--- a/engines/sword2/resman.cpp
+++ b/engines/sword2/resman.cpp
@@ -22,13 +22,16 @@
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/console.h"
 #include "sword2/logic.h"
 #include "sword2/memory.h"
 #include "sword2/resman.h"
 #include "sword2/router.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 #define Debug_Printf _vm->_debugger->DebugPrintf
diff --git a/engines/sword2/router.cpp b/engines/sword2/router.cpp
index bbca609e3c..2840c68c2a 100644
--- a/engines/sword2/router.cpp
+++ b/engines/sword2/router.cpp
@@ -77,11 +77,14 @@
 
 #include "common/stdafx.h"
 #include "common/stream.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/resman.h"
 #include "sword2/router.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/saveload.cpp b/engines/sword2/saveload.cpp
index df03c21be3..dcaded4529 100644
--- a/engines/sword2/saveload.cpp
+++ b/engines/sword2/saveload.cpp
@@ -30,11 +30,16 @@
 
 #include "common/stdafx.h"
 #include "common/savefile.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
+#include "sword2/object.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
+#include "sword2/saveload.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 namespace Sword2 {
diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp
index bc5a31a1f9..8d62d2fa8d 100644
--- a/engines/sword2/screen.cpp
+++ b/engines/sword2/screen.cpp
@@ -27,12 +27,15 @@
 #include "common/system.h"
 
 #include "sword2/sword2.h"
-#include "sword2/console.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
+#include "sword2/console.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/mouse.h"
+#include "sword2/object.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 namespace Sword2 {
diff --git a/engines/sword2/scroll.cpp b/engines/sword2/scroll.cpp
index 3d0a263bc6..503c8646c9 100644
--- a/engines/sword2/scroll.cpp
+++ b/engines/sword2/scroll.cpp
@@ -20,9 +20,12 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp
index d855e88afb..4e093d2a38 100644
--- a/engines/sword2/sound.cpp
+++ b/engines/sword2/sound.cpp
@@ -35,6 +35,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/resman.h"
 #include "sword2/sound.h"
diff --git a/engines/sword2/speech.cpp b/engines/sword2/speech.cpp
index da6bd258ea..7367b2b083 100644
--- a/engines/sword2/speech.cpp
+++ b/engines/sword2/speech.cpp
@@ -23,11 +23,14 @@
 #include "common/file.h"
 
 #include "sword2/sword2.h"
-#include "sword2/console.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
+#include "sword2/console.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
+#include "sword2/object.h"
 #include "sword2/resman.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/startup.cpp b/engines/sword2/startup.cpp
index 2e1dd7b0ae..1a847f95bf 100644
--- a/engines/sword2/startup.cpp
+++ b/engines/sword2/startup.cpp
@@ -24,6 +24,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/memory.h"
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index a864ee9b79..b4d7838b93 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -31,15 +31,17 @@
 #include "common/system.h"
 
 #include "sword2/sword2.h"
+#include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/console.h"
 #include "sword2/controls.h"
-#include "sword2/defs.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/memory.h"
 #include "sword2/mouse.h"
 #include "sword2/resman.h"
 #include "sword2/router.h"
+#include "sword2/screen.h"
 #include "sword2/sound.h"
 
 #ifdef _WIN32_WCE
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index 2fb3eff298..f3aff6b0fb 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -33,12 +33,6 @@
 
 #include "common/util.h"
 
-#include "sword2/screen.h"
-#include "sword2/header.h"
-#include "sword2/icons.h"
-#include "sword2/object.h"
-#include "sword2/saveload.h"
-
 #define	MAX_starts	100
 #define	MAX_description	100
 
diff --git a/engines/sword2/sync.cpp b/engines/sword2/sync.cpp
index 205e273873..cfe17ac713 100644
--- a/engines/sword2/sync.cpp
+++ b/engines/sword2/sync.cpp
@@ -20,8 +20,10 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/logic.h"
 
 namespace Sword2 {
diff --git a/engines/sword2/walker.cpp b/engines/sword2/walker.cpp
index 82ef80f65f..47f01fecf4 100644
--- a/engines/sword2/walker.cpp
+++ b/engines/sword2/walker.cpp
@@ -24,12 +24,15 @@
 // Functions for moving megas about the place & also for keeping tabs on them
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
+#include "sword2/header.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
 #include "sword2/resman.h"
 #include "sword2/router.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {