Removed some now redundant header files.

svn-id: r11209

30 files changed, 12 insertions, 272 deletions

diff --git a/sword2/anims.cpp b/sword2/anims.cpp
index 00797a7300..df2d7ae205 100644
--- a/sword2/anims.cpp
+++ b/sword2/anims.cpp
@@ -27,7 +27,6 @@
 #include "sword2/sword2.h"
 #include "sword2/driver/driver96.h"
 #include "sword2/driver/d_draw.h"
-#include "sword2/anims.h"
 #include "sword2/console.h"
 #include "sword2/controls.h"		// for 'subtitles'
 #include "sword2/defs.h"
@@ -38,8 +37,6 @@
 #include "sword2/object.h"
 #include "sword2/protocol.h"
 #include "sword2/resman.h"
-#include "sword2/sword2.h"
-#include "sword2/sync.h"
 #include "sword2/sound.h"			// for Speech stuff.
 
 namespace Sword2 {
diff --git a/sword2/anims.h b/sword2/anims.h
deleted file mode 100644
index 8b0d564467..0000000000
--- a/sword2/anims.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 1994-2003 Revolution Software Ltd
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- */
-
-#ifndef	_ANIM_S
-#define	_ANIM_S
-
-#include "sword2/driver/driver96.h"
-
-namespace Sword2 {
-
-} // End of namespace Sword2
-
-#endif
diff --git a/sword2/console.cpp b/sword2/console.cpp
index d31f77335e..722b3d1e5d 100644
--- a/sword2/console.cpp
+++ b/sword2/console.cpp
@@ -22,7 +22,6 @@
 #include "sword2/console.h"
 #include "sword2/debug.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
 #include "sword2/mouse.h"
diff --git a/sword2/debug.cpp b/sword2/debug.cpp
index 3efe37747d..8d96dba103 100644
--- a/sword2/debug.cpp
+++ b/sword2/debug.cpp
@@ -23,7 +23,6 @@
 #include "sword2/debug.h"
 #include "sword2/console.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"			// for CountEvents()
 #include "sword2/layers.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"
diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp
index 4b94388b9a..e5ec0ba705 100644
--- a/sword2/driver/d_draw.cpp
+++ b/sword2/driver/d_draw.cpp
@@ -19,14 +19,12 @@
 
 #include "stdafx.h"
 #include "sound/mixer.h"
+#include "sword2/sword2.h"
 #include "sword2/driver/driver96.h"
-#include "sword2/driver/rdwin.h"
 #include "sword2/driver/d_draw.h"
-#include "sword2/driver/palette.h"
 #include "sword2/driver/render.h"
 #include "sword2/header.h"		// HACK: For cutscenes instruction message
 #include "sword2/maketext.h"	// HACK: For cutscenes instruction message
-#include "sword2/sword2.h"
 
 namespace Sword2 {
 
diff --git a/sword2/driver/palette.h b/sword2/driver/palette.h
deleted file mode 100644
index 34de190bd6..0000000000
--- a/sword2/driver/palette.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 1994-2003 Revolution Software Ltd
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- */
-
-#ifndef PALETTE_H
-#define PALETTE_H
-
-namespace Sword2 {
-
-} // End of namespace Sword2
-
-#endif
diff --git a/sword2/driver/rdwin.cpp b/sword2/driver/rdwin.cpp
index 42cc6e96de..911bc1b646 100644
--- a/sword2/driver/rdwin.cpp
+++ b/sword2/driver/rdwin.cpp
@@ -22,9 +22,7 @@
 #include "sword2/driver/driver96.h"
 #include "sword2/driver/_mouse.h"
 #include "sword2/driver/keyboard.h"
-#include "sword2/driver/rdwin.h"
 #include "sword2/driver/d_draw.h"
-#include "sword2/driver/palette.h"
 #include "sword2/driver/render.h"
 #include "sword2/driver/menu.h"
 #include "sword2/driver/d_sound.h"
diff --git a/sword2/driver/rdwin.h b/sword2/driver/rdwin.h
deleted file mode 100644
index 4fbbf33a35..0000000000
--- a/sword2/driver/rdwin.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 1994-2003 Revolution Software Ltd
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- */
-
-#ifndef RDWIN_H
-#define RDWIN_H
-
-namespace Sword2 {
-
-} // End of namespace Sword2
-
-#endif
diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp
index 0b01468ac9..eb58c9b96d 100644
--- a/sword2/driver/render.cpp
+++ b/sword2/driver/render.cpp
@@ -20,7 +20,6 @@
 #include "stdafx.h"
 #include "sword2/driver/driver96.h"
 #include "sword2/driver/d_draw.h"
-#include "sword2/driver/rdwin.h"
 #include "sword2/driver/_mouse.h"
 #include "sword2/driver/render.h"
 #include "sword2/driver/menu.h"
diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp
index ba0a95bc0e..c7bf74177f 100644
--- a/sword2/driver/sprite.cpp
+++ b/sword2/driver/sprite.cpp
@@ -21,9 +21,6 @@
 #include "sword2/driver/driver96.h"
 #include "sword2/driver/d_draw.h"
 #include "sword2/driver/render.h"
-#include "sword2/driver/menu.h"
-#include "sword2/driver/palette.h"
-#include "sword2/driver/rdwin.h"
 
 namespace Sword2 {
 
diff --git a/sword2/events.cpp b/sword2/events.cpp
index 90757fb374..118bea89ef 100644
--- a/sword2/events.cpp
+++ b/sword2/events.cpp
@@ -22,7 +22,6 @@
 #include "sword2/console.h"
 #include "sword2/debug.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
 #include "sword2/object.h"
diff --git a/sword2/events.h b/sword2/events.h
deleted file mode 100644
index a1d358bf22..0000000000
--- a/sword2/events.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 1994-2003 Revolution Software Ltd
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- */
-
-#ifndef	_EVENTS
-#define	_EVENTS
-
-#define	MAX_events 10
-
-namespace Sword2 {
-
-} // End of namespace Sword2
-
-#endif
diff --git a/sword2/function.cpp b/sword2/function.cpp
index 681ac8d469..f2c6b3ff04 100644
--- a/sword2/function.cpp
+++ b/sword2/function.cpp
@@ -19,12 +19,10 @@
 
 #include "stdafx.h"
 #include "sword2/driver/driver96.h"
-#include "sword2/driver/rdwin.h"
 #include "sword2/build_display.h"
 #include "sword2/credits.h"
 #include "sword2/debug.h"
 #include "sword2/defs.h"
-#include "sword2/function.h"
 #include "sword2/interpreter.h"
 #include "sword2/layers.h"		// for '_thisScreen' structure
 #include "sword2/logic.h"
diff --git a/sword2/logic.cpp b/sword2/logic.cpp
index 0e39af8b72..be4b7bc60b 100644
--- a/sword2/logic.cpp
+++ b/sword2/logic.cpp
@@ -27,7 +27,6 @@
 #include "sword2/logic.h"
 #include "sword2/router.h"		// for clearWalkGridList()
 #include "sword2/sound.h"
-#include "sword2/sync.h"
 
 namespace Sword2 {
 
diff --git a/sword2/logic.h b/sword2/logic.h
index 7d3e64bc5c..2ed05f8f6f 100644
--- a/sword2/logic.h
+++ b/sword2/logic.h
@@ -22,17 +22,20 @@
 #ifndef _LOGIC
 #define _LOGIC
 
-#include "sword2/events.h"
+#include "sword2/driver/driver96.h"
 #include "sword2/header.h"
 #include "sword2/memory.h"
 #include "sword2/router.h"
 #include "sword2/speech.h"
 #include "sword2/startup.h"
-#include "sword2/sync.h"
-#include "sword2/driver/driver96.h"
 
 namespace Sword2 {
 
+#define	MAX_events 10
+
+// There won't be many, will there? Probably 2 at most i reckon
+#define	MAX_syncs 10
+
 #define	TREE_SIZE 3
 
 // This must allow for the largest number of objects in a screen
@@ -384,7 +387,6 @@ public:
 	void totalRestart(void);
 	void examineRunList(void);
 	void resetKillList(void);
-
 };
 
 extern Logic *g_logic;
diff --git a/sword2/mouse.cpp b/sword2/mouse.cpp
index 80f80e72a4..814e5aed48 100644
--- a/sword2/mouse.cpp
+++ b/sword2/mouse.cpp
@@ -23,7 +23,6 @@
 #include "sword2/console.h"
 #include "sword2/controls.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"
 #include "sword2/icons.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
diff --git a/sword2/resman.cpp b/sword2/resman.cpp
index 8a47bf9d03..340ebf3747 100644
--- a/sword2/resman.cpp
+++ b/sword2/resman.cpp
@@ -24,7 +24,6 @@
 #include "sword2/console.h"
 #include "sword2/debug.h"
 #include "sword2/defs.h"
-#include "sword2/function.h"
 #include "sword2/header.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
diff --git a/sword2/save_rest.cpp b/sword2/save_rest.cpp
index 9760658bc8..c886fd9dc7 100644
--- a/sword2/save_rest.cpp
+++ b/sword2/save_rest.cpp
@@ -27,10 +27,10 @@
 // ---------------------------------------------------------------------------
 
 #include "stdafx.h"
+#include "sword2/sword2.h"
 #include "sword2/driver/driver96.h"
 #include "sword2/console.h"
 #include "sword2/defs.h"
-#include "sword2/function.h"	// for engine_logic, engine_graph, etc
 #include "sword2/interpreter.h"	// for IR_CONT, etc
 #include "sword2/layers.h"
 #include "sword2/logic.h"
@@ -40,10 +40,7 @@
 #include "sword2/resman.h"
 #include "sword2/router.h"
 #include "sword2/save_rest.h"
-#include "sword2/scroll.h"		// for Set_scrolling()
 #include "sword2/sound.h"
-#include "sword2/sword2.h"
-#include "sword2/walker.h"
 
 namespace Sword2 {
 
diff --git a/sword2/scroll.cpp b/sword2/scroll.cpp
index 1c64d08057..49719524bf 100644
--- a/sword2/scroll.cpp
+++ b/sword2/scroll.cpp
@@ -26,7 +26,6 @@
 #include "sword2/interpreter.h"
 #include "sword2/layers.h"
 #include "sword2/logic.h"
-#include "sword2/scroll.h"
 
 namespace Sword2 {
 
diff --git a/sword2/scroll.h b/sword2/scroll.h
deleted file mode 100644
index 6b776a424b..0000000000
--- a/sword2/scroll.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 1994-2003 Revolution Software Ltd
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- */
-
-// the usual suspects
-
-#ifndef	_SCROLL
-#define	_SCROLL
-
-namespace Sword2 {
-} // End of namespace Sword2
-
-#endif
diff --git a/sword2/speech.cpp b/sword2/speech.cpp
index e3a5f17697..e00da21fa7 100644
--- a/sword2/speech.cpp
+++ b/sword2/speech.cpp
@@ -18,13 +18,11 @@
  */
 
 #include "stdafx.h"
-#include "sword2/anims.h"
+#include "sword2/sword2.h"
 #include "sword2/console.h"
 #include "sword2/controls.h"	// for 'subtitles' & 'speechSelected'
 #include "sword2/debug.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"
-#include "sword2/function.h"
 #include "sword2/interpreter.h"
 #include "sword2/layers.h"		// for 'this_screen'
 #include "sword2/logic.h"
@@ -36,8 +34,6 @@
 #include "sword2/resman.h"
 #include "sword2/sound.h"
 #include "sword2/speech.h"
-#include "sword2/sword2.h"
-#include "sword2/walker.h"
 
 namespace Sword2 {
 
diff --git a/sword2/startup.cpp b/sword2/startup.cpp
index 0ec0768911..3f6159b177 100644
--- a/sword2/startup.cpp
+++ b/sword2/startup.cpp
@@ -35,8 +35,6 @@
 #include "sword2/sound.h"
 #include "sword2/speech.h"		// for '_speechTextBlocNo' - so that speech text can be cleared when running a new start-script
 #include "sword2/startup.h"
-#include "sword2/sync.h"
-#include "sword2/tony_gsdk.h"
 
 namespace Sword2 {
 
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index 20fcad672b..11bd4b7895 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -23,13 +23,13 @@
 #include "base/plugins.h"
 #include "common/config-manager.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/driver96.h"
 #include "sword2/defs.h"
 #include "sword2/build_display.h"
 #include "sword2/console.h"
 #include "sword2/controls.h"
 #include "sword2/credits.h"
 #include "sword2/debug.h"
-#include "sword2/events.h"
 #include "sword2/header.h"
 #include "sword2/interpreter.h"
 #include "sword2/layers.h"
@@ -40,13 +40,9 @@
 #include "sword2/protocol.h"
 #include "sword2/resman.h"
 #include "sword2/save_rest.h"
-#include "sword2/scroll.h"
 #include "sword2/sound.h"
 #include "sword2/speech.h"
 #include "sword2/startup.h"
-#include "sword2/sync.h"
-#include "sword2/driver/driver96.h"
-#include "sword2/driver/palette.h"
 
 #ifdef _WIN32_WCE
 extern bool isSmartphone(void);
diff --git a/sword2/sword2.h b/sword2/sword2.h
index 9d218ffb02..b8d2094cd9 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -27,7 +27,6 @@
 #include "common/str.h"
 #include "sword2/build_display.h"
 #include "sword2/console.h"
-#include "sword2/events.h"
 #include "sword2/header.h"
 #include "sword2/icons.h"
 #include "sword2/layers.h"
diff --git a/sword2/sync.cpp b/sword2/sync.cpp
index 3e24fcc741..72248416bf 100644
--- a/sword2/sync.cpp
+++ b/sword2/sync.cpp
@@ -19,11 +19,11 @@
 
 #include "stdafx.h"
 #include "common/util.h"
+#include "sword2/sword2.h"
 #include "sword2/debug.h"
 #include "sword2/defs.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
-#include "sword2/sync.h"
 
 namespace Sword2 {
 
diff --git a/sword2/sync.h b/sword2/sync.h
deleted file mode 100644
index fb3fdef03f..0000000000
--- a/sword2/sync.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 1994-2003 Revolution Software Ltd
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- */
-
-#ifndef	_SYNC
-#define	_SYNC
-
-// There won't be many, will there? Probably 2 at most i reckon
-#define	MAX_syncs 10
-
-namespace Sword2 {
-
-} // End of namespace Sword2
-
-#endif
diff --git a/sword2/tony_gsdk.cpp b/sword2/tony_gsdk.cpp
index 7dd6c68a59..e7bd7cdd59 100644
--- a/sword2/tony_gsdk.cpp
+++ b/sword2/tony_gsdk.cpp
@@ -20,11 +20,10 @@
 // general odds and ends
 
 #include "stdafx.h"
+#include "sword2/sword2.h"
 #include "sword2/driver/driver96.h"
 #include "sword2/debug.h"
 #include "sword2/memory.h"
-#include "sword2/tony_gsdk.h"
-#include "sword2/sword2.h"
 
 namespace Sword2 {
 
diff --git a/sword2/tony_gsdk.h b/sword2/tony_gsdk.h
deleted file mode 100644
index bfbd06ef84..0000000000
--- a/sword2/tony_gsdk.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 1994-2003 Revolution Software Ltd
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- */
-
-#ifndef	TONY_GSDK
-#define	TONY_GSDK
-
-namespace Sword2 {
-
-} // End of namespace Sword2
-
-#endif
diff --git a/sword2/walker.cpp b/sword2/walker.cpp
index b12f5966ed..06d4a6a98b 100644
--- a/sword2/walker.cpp
+++ b/sword2/walker.cpp
@@ -26,14 +26,11 @@
 #include "sword2/sword2.h"
 #include "sword2/console.h"
 #include "sword2/defs.h"
-#include "sword2/events.h"
-#include "sword2/function.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
 #include "sword2/object.h"
 #include "sword2/protocol.h"
 #include "sword2/router.h"
-#include "sword2/sync.h"
 
 namespace Sword2 {
 
diff --git a/sword2/walker.h b/sword2/walker.h
deleted file mode 100644
index 73fefc8fbf..0000000000
--- a/sword2/walker.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 1994-2003 Revolution Software Ltd
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- */
-
-#ifndef	_WALKER
-#define	_WALKER
-
-namespace Sword2 {
-
-} // End of namespace Sword2
-
-#endif