From 4fad04846a1341aa1a115d7e6896c1f1ca7dd3ea Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 4 Oct 2003 08:07:03 +0000
Subject: Changed to use #include "bs2/..." and removed the inclusion of
 standard C headers. Most (all?) of the ones we need should probably come from
 stdafx.h instead.

svn-id: r10588
---
 sword2/anims.cpp           | 34 ++++++++++++++--------------------
 sword2/anims.h             |  2 +-
 sword2/build_display.cpp   | 22 ++++++++++------------
 sword2/build_display.h     |  2 +-
 sword2/console.cpp         | 44 +++++++++++++++++++-------------------------
 sword2/console.h           |  4 ++--
 sword2/controls.cpp        | 34 +++++++++++++++++-----------------
 sword2/credits.h           |  6 +++---
 sword2/debug.cpp           | 34 ++++++++++++++--------------------
 sword2/debug.h             |  4 ++--
 sword2/defs.h              |  4 ++--
 sword2/driver/_console.cpp |  5 -----
 sword2/driver/_console.h   | 14 --------------
 sword2/driver/d_draw.cpp   |  9 ++++-----
 sword2/driver/d_sound.cpp  |  6 +++---
 sword2/driver/driver96.h   |  4 ----
 sword2/driver/keyboard.h   | 14 --------------
 sword2/driver/menu.cpp     |  2 +-
 sword2/driver/menu.h       | 17 +++--------------
 sword2/driver/palette.cpp  |  2 --
 sword2/driver/palette.h    | 14 --------------
 sword2/driver/rdwin.cpp    |  2 --
 sword2/driver/render.h     | 13 -------------
 sword2/driver/sprite.cpp   | 12 ++++++------
 sword2/events.cpp          | 18 +++++++++---------
 sword2/events.h            |  2 +-
 sword2/function.cpp        | 28 ++++++++++++++--------------
 sword2/function.h          |  2 +-
 sword2/icons.cpp           |  9 +++++----
 sword2/icons.h             |  2 +-
 sword2/interpreter.cpp     |  7 +++----
 sword2/interpreter.h       |  4 ++--
 sword2/layers.cpp          | 14 +++++++-------
 sword2/layers.h            |  2 --
 sword2/logic.cpp           | 16 ++++++++--------
 sword2/logic.h             |  4 ++--
 sword2/maketext.cpp        | 22 ++++++++++------------
 sword2/maketext.h          |  8 ++++----
 sword2/mem_view.cpp        | 10 +++++-----
 sword2/memory.cpp          |  8 ++++----
 sword2/memory.h            |  2 --
 sword2/mouse.cpp           | 32 ++++++++++++++++----------------
 sword2/mouse.h             |  4 +---
 sword2/object.h            |  2 --
 sword2/protocol.cpp        | 14 ++++++--------
 sword2/protocol.h          |  4 ++--
 sword2/resman.cpp          | 40 ++++++++++++++++------------------------
 sword2/resman.h            |  2 +-
 sword2/router.cpp          | 20 ++++++++++----------
 sword2/router.h            |  4 ++--
 sword2/save_rest.cpp       | 36 +++++++++++++++++-------------------
 sword2/save_rest.h         |  2 +-
 sword2/scroll.cpp          | 14 +++++++-------
 sword2/sound.cpp           | 16 +++++++---------
 sword2/sound.h             |  2 --
 sword2/speech.cpp          | 42 ++++++++++++++++++++----------------------
 sword2/speech.h            |  2 +-
 sword2/startup.cpp         | 38 ++++++++++++++++++--------------------
 sword2/sword2.cpp          |  3 ---
 sword2/sword2.h            |  7 ++++++-
 sword2/sync.cpp            |  9 +++++----
 sword2/sync.h              |  2 +-
 sword2/tony_gsdk.cpp       | 11 +++++------
 sword2/tony_gsdk.h         |  2 +-
 sword2/walker.cpp          | 20 ++++++++++----------
 65 files changed, 331 insertions(+), 459 deletions(-)

diff --git a/sword2/anims.cpp b/sword2/anims.cpp
index bfd283000f..c164360815 100644
--- a/sword2/anims.cpp
+++ b/sword2/anims.cpp
@@ -23,28 +23,22 @@
 // DON'T TOUCH!
 // ---------------------------------------------------------------------------
 
-#include <stdio.h>		// for sprintf
-
-#ifdef _SWORD2_DEBUG
-#include <string.h>		// for strlen
-#endif
-
 #include "stdafx.h"
 #include "common/scummsys.h"
-#include "driver/driver96.h"
-#include "anims.h"
-#include "console.h"
-#include "controls.h"		// for 'speechSelected' & 'subtitles'
-#include "defs.h"
-#include "header.h"
-#include "interpreter.h"
-#include "maketext.h"		// for MakeTextSprite used by FN_play_sequence ultimately
-#include "object.h"
-#include "protocol.h"
-#include "resman.h"
-#include "sword2.h"
-#include "sync.h"
-#include "sound.h"		// for Speech stuff.
+#include "bs2/driver/driver96.h"
+#include "bs2/anims.h"
+#include "bs2/console.h"
+#include "bs2/controls.h"		// for 'speechSelected' & 'subtitles'
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/maketext.h"		// for MakeTextSprite used by FN_play_sequence ultimately
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sword2.h"
+#include "bs2/sync.h"
+#include "bs2/sound.h"			// for Speech stuff.
 
 namespace Sword2 {
 
diff --git a/sword2/anims.h b/sword2/anims.h
index 77b8a4a436..30605b8685 100644
--- a/sword2/anims.h
+++ b/sword2/anims.h
@@ -20,7 +20,7 @@
 #ifndef	_ANIM_S
 #define	_ANIM_S
 
-#include "driver/driver96.h"
+#include "bs2/driver/driver96.h"
 
 namespace Sword2 {
 
diff --git a/sword2/build_display.cpp b/sword2/build_display.cpp
index 0563f3c063..217a07861a 100644
--- a/sword2/build_display.cpp
+++ b/sword2/build_display.cpp
@@ -21,19 +21,17 @@
 // BUILD_DISPLAY.CPP	like the old spr_engi but slightly more aptly named
 // ---------------------------------------------------------------------------
 
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "build_display.h"
-#include "console.h"
-#include "defs.h"
-#include "interpreter.h"
-#include "layers.h"
-#include "maketext.h"
-#include "mouse.h"
-#include "object.h"
-#include "protocol.h"
-#include "resman.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/defs.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"
+#include "bs2/maketext.h"
+#include "bs2/mouse.h"
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
 
 namespace Sword2 {
 
diff --git a/sword2/build_display.h b/sword2/build_display.h
index 1cb7d5ef0b..c60539cb71 100644
--- a/sword2/build_display.h
+++ b/sword2/build_display.h
@@ -20,7 +20,7 @@
 #ifndef	_BUILD_DISPLAY
 #define	_BUILD_DISPLAY
 
-#include "driver/driver96.h"
+#include "bs2/driver/driver96.h"
 
 namespace Sword2 {
 
diff --git a/sword2/console.cpp b/sword2/console.cpp
index 304fcd3752..62b221c0b9 100644
--- a/sword2/console.cpp
+++ b/sword2/console.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
+#include "bs2/driver/driver96.h"
 
 namespace Sword2 {
 uint32	console_status = 0;	//0 off		// LEFT IN RELEASE VERSION
@@ -28,30 +28,24 @@ uint32	console_status = 0;	//0 off		// LEFT IN RELEASE VERSION
 
 // its the console! <great>
 
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>		// for version string stuff
-
-#include "build_display.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"
-#include "events.h"		// so we can display the event list in Con_display_events()
-#include "header.h"
-#include "layers.h"
-#include "logic.h"
-#include "maketext.h"		// for InitialiseFontResourceFlags()
-#include "mouse.h"
-#include "mem_view.h"
-#include "memory.h"
-#include "protocol.h"
-#include "resman.h"
-#include "save_rest.h"
-#include "startup.h"
-#include "sword2.h"
-#include "time.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"		// so we can display the event list in Con_display_events()
+#include "bs2/header.h"
+#include "bs2/layers.h"
+#include "bs2/logic.h"
+#include "bs2/maketext.h"	// for InitialiseFontResourceFlags()
+#include "bs2/mouse.h"
+#include "bs2/mem_view.h"
+#include "bs2/memory.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/save_rest.h"
+#include "bs2/startup.h"
+#include "bs2/sword2.h"
+#include "bs2/time.h"
 
 namespace Sword2 {
 
diff --git a/sword2/console.h b/sword2/console.h
index 4d5c6ddcf7..9f8b5e975d 100644
--- a/sword2/console.h
+++ b/sword2/console.h
@@ -20,8 +20,8 @@
 #ifndef	C_ONSOLE_H
 #define	C_ONSOLE_H
 
-#include "driver/driver96.h"
-#include "memory.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/memory.h"
 
 namespace Sword2 {
 
diff --git a/sword2/controls.cpp b/sword2/controls.cpp
index 9840820d4e..8fe12953f6 100644
--- a/sword2/controls.cpp
+++ b/sword2/controls.cpp
@@ -18,23 +18,23 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "build_display.h"
-#include "console.h"
-#include "controls.h"
-#include "defs.h"
-#include "header.h"
-#include "interpreter.h"
-#include "layers.h"
-#include "logic.h"
-#include "maketext.h"			// for font resource variables
-#include "mouse.h"
-#include "protocol.h"
-#include "resman.h"
-#include "router.h"
-#include "save_rest.h"
-#include "sound.h"
-#include "sword2.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/controls.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"
+#include "bs2/logic.h"
+#include "bs2/maketext.h"			// for font resource variables
+#include "bs2/mouse.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/router.h"
+#include "bs2/save_rest.h"
+#include "bs2/sound.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 
diff --git a/sword2/credits.h b/sword2/credits.h
index 1de577484e..db07f095b8 100644
--- a/sword2/credits.h
+++ b/sword2/credits.h
@@ -17,10 +17,10 @@
  * $Header$
  */
 
-#ifndef _Credits_h_
-#define _Credits_h_
+#ifndef _CREDITS_H
+#define _CREDITS_H
 
-#include "driver/driver96.h"
+#include "bs2/driver/driver96.h"
 
 namespace Sword2 {
 
diff --git a/sword2/debug.cpp b/sword2/debug.cpp
index 52e03c75c3..a969056716 100644
--- a/sword2/debug.cpp
+++ b/sword2/debug.cpp
@@ -17,31 +17,25 @@
  * $Header$
  */
 
-#include <stdarg.h> // for ExitWithReport, which stays in RELEASE version
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "debug.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/debug.h"
 
 // this whole file (except ExitWithReport) only included on debug versions
 #ifdef _SWORD2_DEBUG
 
-#include <stdlib.h>
-
-#include "build_display.h"		// for 'fps'
-#include "console.h"
-#include "defs.h"
-#include "events.h"			// for CountEvents()
-#include "layers.h"
-#include "logic.h"
-#include "maketext.h"
-#include "mem_view.h"
-#include "mouse.h"
-#include "protocol.h"
-#include "resman.h"
-#include "router.h"			// for PlotWalkGrid()
-#include "speech.h"			// for 'officialTextNumber' and
+#include "bs2/build_display.h"		// for 'fps'
+#include "bs2/console.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"			// for CountEvents()
+#include "bs2/layers.h"
+#include "bs2/logic.h"
+#include "bs2/maketext.h"
+#include "bs2/mouse.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/router.h"			// for PlotWalkGrid()
+#include "bs2/speech.h"			// for 'officialTextNumber' and
 					// 'speechScriptWaiting'
 
 namespace Sword2 {
diff --git a/sword2/debug.h b/sword2/debug.h
index cf6b73b840..bad786c53b 100644
--- a/sword2/debug.h
+++ b/sword2/debug.h
@@ -23,8 +23,8 @@
 // this whole file only included on debug versions
 #ifdef _SWORD2_DEBUG
 
-#include "driver.h"
-#include "object.h"
+#include "bs2/driver.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 
diff --git a/sword2/defs.h b/sword2/defs.h
index 61604016f8..7f88352d14 100644
--- a/sword2/defs.h
+++ b/sword2/defs.h
@@ -20,8 +20,8 @@
 #ifndef	DEFS
 #define	DEFS
 
-#include "header.h"
-#include "resman.h"
+#include "bs2/header.h"
+#include "bs2/resman.h"
 
 #define	SIZE	0x10000			// 65536 items per section
 #define	NuSIZE	0xffff			// & with this
diff --git a/sword2/driver/_console.cpp b/sword2/driver/_console.cpp
index 82672f7bc9..34c9db0c18 100644
--- a/sword2/driver/_console.cpp
+++ b/sword2/driver/_console.cpp
@@ -43,15 +43,10 @@
 //
 //=============================================================================
 
-
-//#include "ddraw.h"
-
 #include "stdafx.h"
 #include "bs2/driver/driver96.h"
-
 #include "bs2/driver/d_draw.h"
 
-
 namespace Sword2 {
 
 uint8			consoleStatus = 0;			// 1 - console display
diff --git a/sword2/driver/_console.h b/sword2/driver/_console.h
index ed88fb6403..a327cd95c1 100644
--- a/sword2/driver/_console.h
+++ b/sword2/driver/_console.h
@@ -17,19 +17,6 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	console.h
-//	Created		:	19th September 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the console.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//=============================================================================
-
-
 #ifndef DRIVER_CONSOLE_H
 #define DRIVER_CONSOLE_H
 
@@ -39,5 +26,4 @@ extern void DisplayConsole(void);
 
 } // End of namespace Sword2
 
-
 #endif
diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp
index 74abb18fa0..cba4bb1e6d 100644
--- a/sword2/driver/d_draw.cpp
+++ b/sword2/driver/d_draw.cpp
@@ -17,17 +17,16 @@
  * $Header$
  */
 
-#include <stdio.h>
 #include "stdafx.h"
-#include "bs2/driver/driver96.h"
-#include "bs2/header.h"		// HACK: For cutscenes instruction message
-#include "bs2/maketext.h"	// HACK: For cutscenes instruction message
-#include "bs2/sword2.h"
 #include "sound/mixer.h"
+#include "bs2/driver/driver96.h"
 #include "bs2/driver/rdwin.h"
 #include "bs2/driver/d_draw.h"
 #include "bs2/driver/palette.h"
 #include "bs2/driver/render.h"
+#include "bs2/header.h"		// HACK: For cutscenes instruction message
+#include "bs2/maketext.h"	// HACK: For cutscenes instruction message
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index 66435dedcc..eb160b7e27 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -33,12 +33,12 @@
 // opinions on this?
 
 #include "stdafx.h"
-#include "bs2/driver/driver96.h"
-#include "bs2/driver/d_sound.h"
-#include "bs2/sword2.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 #include "sound/rate.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/driver/d_sound.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 
diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h
index 051ffa1046..ac07508df3 100644
--- a/sword2/driver/driver96.h
+++ b/sword2/driver/driver96.h
@@ -20,10 +20,6 @@
 #ifndef DRIVER96_H
 #define DRIVER96_H
 
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "common/scummsys.h"
 #include "base/engine.h" // for warning()
 #include "common/system.h"
diff --git a/sword2/driver/keyboard.h b/sword2/driver/keyboard.h
index 9758b56d50..e08e892d85 100644
--- a/sword2/driver/keyboard.h
+++ b/sword2/driver/keyboard.h
@@ -17,20 +17,6 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	keyboard.h
-//	Created		:	19th September 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the keyboard.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//
-//=============================================================================
-
-
 #ifndef KEYBOARD_H
 #define KEYBOARD_H
 
diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp
index a83cb2ae2d..4f03aa3e9b 100644
--- a/sword2/driver/menu.cpp
+++ b/sword2/driver/menu.cpp
@@ -18,11 +18,11 @@
  */
 
 #include "stdafx.h"
+#include "common/rect.h"
 #include "bs2/driver/driver96.h"
 #include "bs2/driver/menu.h"
 #include "bs2/driver/d_draw.h"
 #include "bs2/driver/render.h"
-#include "common/rect.h"
 
 namespace Sword2 {
 
diff --git a/sword2/driver/menu.h b/sword2/driver/menu.h
index 8e44d9a28f..6c5c7f1b86 100644
--- a/sword2/driver/menu.h
+++ b/sword2/driver/menu.h
@@ -17,25 +17,14 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	menu.h
-//	Created		:	15th November 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the menu.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//
-//=============================================================================
-
-
 #ifndef MENU_H
 #define MENU_H
 
+namespace Sword2 {
 
 #define MENUDEEP 40
 
+} // End of namespace Sword2
+
 #endif
 
diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp
index 47000f84cb..fe10ce31c0 100644
--- a/sword2/driver/palette.cpp
+++ b/sword2/driver/palette.cpp
@@ -18,8 +18,6 @@
  */
 
 #include "stdafx.h"
-#include <stdio.h>
-
 #include "common/util.h"
 #include "base/engine.h"
 #include "bs2/driver/d_draw.h"
diff --git a/sword2/driver/palette.h b/sword2/driver/palette.h
index cf66427597..705cbe9030 100644
--- a/sword2/driver/palette.h
+++ b/sword2/driver/palette.h
@@ -17,20 +17,6 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	palette.h
-//	Created		:	8th November 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the palette.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//
-//=============================================================================
-
-
 #ifndef PALETTE_H
 #define PALETTE_H
 
diff --git a/sword2/driver/rdwin.cpp b/sword2/driver/rdwin.cpp
index 88b870bee9..95a5e12efc 100644
--- a/sword2/driver/rdwin.cpp
+++ b/sword2/driver/rdwin.cpp
@@ -20,9 +20,7 @@
 #include "common/stdafx.h"
 #include "base/engine.h"
 #include "common/timer.h"
-
 #include "bs2/driver/driver96.h"
-
 #include "bs2/driver/_mouse.h"
 #include "bs2/driver/keyboard.h"
 #include "bs2/driver/rdwin.h"
diff --git a/sword2/driver/render.h b/sword2/driver/render.h
index 034eb1e936..f438ede23c 100644
--- a/sword2/driver/render.h
+++ b/sword2/driver/render.h
@@ -17,19 +17,6 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	render.h
-//	Created		:	26th August 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the render.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//
-//=============================================================================
-
 #ifndef RENDER_H
 #define RENDER_H
 
diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp
index de2c59fadb..c2da022430 100644
--- a/sword2/driver/sprite.cpp
+++ b/sword2/driver/sprite.cpp
@@ -18,12 +18,12 @@
  */
 
 #include "stdafx.h"
-#include "driver96.h"
-#include "d_draw.h"
-#include "render.h"
-#include "menu.h"
-#include "palette.h"
-#include "rdwin.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/driver/d_draw.h"
+#include "bs2/driver/render.h"
+#include "bs2/driver/menu.h"
+#include "bs2/driver/palette.h"
+#include "bs2/driver/rdwin.h"
 
 namespace Sword2 {
 
diff --git a/sword2/events.cpp b/sword2/events.cpp
index 74485eae6e..d5766b9e1e 100644
--- a/sword2/events.cpp
+++ b/sword2/events.cpp
@@ -18,15 +18,15 @@
  */
 
 #include "stdafx.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"
-#include "events.h"
-#include "interpreter.h"
-#include "logic.h"
-#include "memory.h"
-#include "object.h"
-#include "sync.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"
+#include "bs2/interpreter.h"
+#include "bs2/logic.h"
+#include "bs2/memory.h"
+#include "bs2/object.h"
+#include "bs2/sync.h"
 
 namespace Sword2 {
 
diff --git a/sword2/events.h b/sword2/events.h
index f5ef1c9776..43f7f826ba 100644
--- a/sword2/events.h
+++ b/sword2/events.h
@@ -20,7 +20,7 @@
 #ifndef	_EVENTS
 #define	_EVENTS
 
-#include "object.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 
diff --git a/sword2/function.cpp b/sword2/function.cpp
index df16115934..0016771e7a 100644
--- a/sword2/function.cpp
+++ b/sword2/function.cpp
@@ -18,20 +18,20 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "driver/rdwin.h"
-#include "build_display.h"
-#include "credits.h"
-#include "debug.h"
-#include "defs.h"
-#include "function.h"
-#include "interpreter.h"
-#include "layers.h"		// for 'this_screen' structure
-#include "logic.h"
-#include "protocol.h"
-#include "resman.h"
-#include "sound.h"
-#include "sword2.h"		// for CloseGame()
+#include "bs2/driver/driver96.h"
+#include "bs2/driver/rdwin.h"
+#include "bs2/build_display.h"
+#include "bs2/credits.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/function.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"		// for 'this_screen' structure
+#include "bs2/logic.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sound.h"
+#include "bs2/sword2.h"		// for CloseGame()
 
 namespace Sword2 {
 
diff --git a/sword2/function.h b/sword2/function.h
index 0f46645489..375e626249 100644
--- a/sword2/function.h
+++ b/sword2/function.h
@@ -20,7 +20,7 @@
 #ifndef	_FUNCTION
 #define	_FUNCTION
 
-#include "object.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 
diff --git a/sword2/icons.cpp b/sword2/icons.cpp
index f1bc486631..4be1a460af 100644
--- a/sword2/icons.cpp
+++ b/sword2/icons.cpp
@@ -18,10 +18,11 @@
  */
 
 #include "stdafx.h"
-#include "defs.h"
-#include "icons.h"
-#include "interpreter.h"
-#include "mouse.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/defs.h"
+#include "bs2/icons.h"
+#include "bs2/interpreter.h"
+#include "bs2/mouse.h"
 
 namespace Sword2 {
 
diff --git a/sword2/icons.h b/sword2/icons.h
index c95350c092..68af8b9a9b 100644
--- a/sword2/icons.h
+++ b/sword2/icons.h
@@ -20,7 +20,7 @@
 #ifndef	_ICONS
 #define	_ICONS
 
-#include "object.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 
diff --git a/sword2/interpreter.cpp b/sword2/interpreter.cpp
index 1ed1d4bb70..407767340b 100644
--- a/sword2/interpreter.cpp
+++ b/sword2/interpreter.cpp
@@ -18,10 +18,9 @@
  */
 
 #include "stdafx.h"
-
-#include "console.h"
-#include "driver/driver96.h"
-#include "interpreter.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/console.h"
+#include "bs2/interpreter.h"
 
 namespace Sword2 {
 
diff --git a/sword2/interpreter.h b/sword2/interpreter.h
index 5b35767d0c..0a9a1c3bb4 100644
--- a/sword2/interpreter.h
+++ b/sword2/interpreter.h
@@ -20,8 +20,8 @@
 #ifndef _INTERPRETER
 #define _INTERPRETER
 
-#include "debug.h"
-#include "header.h"
+#include "bs2/debug.h"
+#include "bs2/header.h"
 
 namespace Sword2 {
 
diff --git a/sword2/layers.cpp b/sword2/layers.cpp
index 09fb053805..d1357514af 100644
--- a/sword2/layers.cpp
+++ b/sword2/layers.cpp
@@ -26,13 +26,13 @@
 //	up to 2 foreground parallax layers
 
 #include "stdafx.h"
-#include "build_display.h"
-#include "debug.h"
-#include "header.h"
-#include "layers.h"
-#include "protocol.h"
-#include "resman.h"
-#include "sound.h"	// for Clear_fx_queue() called from FN_init_background()
+#include "bs2/build_display.h"
+#include "bs2/debug.h"
+#include "bs2/header.h"
+#include "bs2/layers.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sound.h"	// for Clear_fx_queue() called from FN_init_background()
 
 namespace Sword2 {
 
diff --git a/sword2/layers.h b/sword2/layers.h
index 04b79d3bd5..f96829e44c 100644
--- a/sword2/layers.h
+++ b/sword2/layers.h
@@ -20,8 +20,6 @@
 #ifndef	_LAYERS
 #define	_LAYERS
 
-#include "memory.h"
-
 namespace Sword2 {
 
 typedef	struct {
diff --git a/sword2/logic.cpp b/sword2/logic.cpp
index 5ba405db7a..dfec05368e 100644
--- a/sword2/logic.cpp
+++ b/sword2/logic.cpp
@@ -18,14 +18,14 @@
  */
 
 #include "stdafx.h"
-#include "build_display.h"
-#include "console.h"
-#include "debug.h"
-#include "interpreter.h"
-#include "logic.h"
-#include "router.h"		// for ClearWalkGridList()
-#include "sound.h"
-#include "sync.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/interpreter.h"
+#include "bs2/logic.h"
+#include "bs2/router.h"		// for ClearWalkGridList()
+#include "bs2/sound.h"
+#include "bs2/sync.h"
 
 namespace Sword2 {
 
diff --git a/sword2/logic.h b/sword2/logic.h
index 9e1630a2bf..92a2971291 100644
--- a/sword2/logic.h
+++ b/sword2/logic.h
@@ -22,8 +22,8 @@
 #ifndef _LOGIC
 #define _LOGIC
 
-#include "defs.h"
-#include "header.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
 
 namespace Sword2 {
 
diff --git a/sword2/maketext.cpp b/sword2/maketext.cpp
index c0f7df1e3a..35ae08956b 100644
--- a/sword2/maketext.cpp
+++ b/sword2/maketext.cpp
@@ -50,19 +50,17 @@
 #define LAST_CHAR	255	// last character in character set
 #define DUD		64	// the first "chequered flag" (dud) symbol in
 				// our character set is in the '@' position
-#include <string.h>
-
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"		// for SPEECH_FONT_ID & CONSOLE_FONT_ID
-#include "header.h"
-#include "maketext.h"
-#include "memory.h"
-#include "protocol.h"		// for FetchFrameHeader()
-#include "resman.h"
-#include "sword2.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"		// for SPEECH_FONT_ID & CONSOLE_FONT_ID
+#include "bs2/header.h"
+#include "bs2/maketext.h"
+#include "bs2/memory.h"
+#include "bs2/protocol.h"	// for FetchFrameHeader()
+#include "bs2/resman.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 
diff --git a/sword2/maketext.h b/sword2/maketext.h
index 4a4f076718..d3defa1c55 100644
--- a/sword2/maketext.h
+++ b/sword2/maketext.h
@@ -57,7 +57,7 @@
 #ifndef _MAKETEXT_H
 #define _MAKETEXT_H
 
-#include "memory.h"
+#include "bs2/memory.h"
 
 namespace Sword2 {
 
@@ -77,7 +77,7 @@ mem* MakeTextSprite(uint8 *sentence, uint16 maxWidth, uint8 pen, uint32 fontRes)
 void Init_text_bloc_system(void);
 
 void Kill_text_bloc(uint32 bloc_number);
-void Print_text_blocs(void);	// Tony16Oct96
+void Print_text_blocs(void);
 
 uint32 Build_new_block(uint8 *ascii, int16 x, int16 y, uint16 width, uint8 pen, uint32 type, uint32 fontRes, uint8 justification);
 
@@ -85,9 +85,9 @@ uint32 Build_new_block(uint8 *ascii, int16 x, int16 y, uint16 width, uint8 pen,
 #define FINNISH_TEXT	1
 #define POLISH_TEXT	2
 
-// this one works out the language from the text cluster (James31july97)
+// this one works out the language from the text cluster
 void InitialiseFontResourceFlags(void);
-// this one allow you to select the fonts yourself (James31july97)
+// this one allow you to select the fonts yourself
 void InitialiseFontResourceFlags(uint8 language);
 
 extern uint32 speech_font_id;
diff --git a/sword2/mem_view.cpp b/sword2/mem_view.cpp
index dba3f31eca..ae2c5142ac 100644
--- a/sword2/mem_view.cpp
+++ b/sword2/mem_view.cpp
@@ -18,11 +18,11 @@
  */
 
 #include "stdafx.h"
-#include "build_display.h"
-#include "console.h"
-#include "header.h"
-#include "memory.h"
-#include "resman.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/header.h"
+#include "bs2/memory.h"
+#include "bs2/resman.h"
 
 namespace Sword2 {
 
diff --git a/sword2/memory.cpp b/sword2/memory.cpp
index b05f106b11..f3db4aa120 100644
--- a/sword2/memory.cpp
+++ b/sword2/memory.cpp
@@ -38,10 +38,10 @@
 // MemMan v1.1
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "debug.h"
-#include "memory.h"
-#include "resman.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/debug.h"
+#include "bs2/memory.h"
+#include "bs2/resman.h"
 
 namespace Sword2 {
 
diff --git a/sword2/memory.h b/sword2/memory.h
index 7286b71437..c0a6914c2c 100644
--- a/sword2/memory.h
+++ b/sword2/memory.h
@@ -20,8 +20,6 @@
 #ifndef	MEMORY_H
 #define	MEMORY_H
 
-#include "common/scummsys.h"
-
 namespace Sword2 {
 
 typedef	struct {
diff --git a/sword2/mouse.cpp b/sword2/mouse.cpp
index 3827801771..b066122582 100644
--- a/sword2/mouse.cpp
+++ b/sword2/mouse.cpp
@@ -18,22 +18,22 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "build_display.h"
-#include "console.h"
-#include "controls.h"
-#include "defs.h"
-#include "events.h"
-#include "icons.h"
-#include "interpreter.h"
-#include "layers.h"
-#include "maketext.h"
-#include "mouse.h"
-#include "object.h"
-#include "protocol.h"
-#include "resman.h"
-#include "sound.h"
-#include "sword2.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/controls.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"
+#include "bs2/icons.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"
+#include "bs2/maketext.h"
+#include "bs2/mouse.h"
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sound.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 
diff --git a/sword2/mouse.h b/sword2/mouse.h
index a6d4a857ae..c15e8fcf54 100644
--- a/sword2/mouse.h
+++ b/sword2/mouse.h
@@ -17,12 +17,10 @@
  * $Header$
  */
 
-//mouse stuff
-
 #ifndef MOUSE_H
 #define MOUSE_H
 
-#include "object.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 
diff --git a/sword2/object.h b/sword2/object.h
index ae04efa5ed..27af4723a1 100644
--- a/sword2/object.h
+++ b/sword2/object.h
@@ -20,8 +20,6 @@
 #ifndef	_SCRIPT_STRUCTURES
 #define	_SCRIPT_STRUCTURES
 
-#include "driver/driver96.h"
-
 namespace Sword2 {
 
 // these structures represent the broken up compact components
diff --git a/sword2/protocol.cpp b/sword2/protocol.cpp
index 1f9a58081e..b118e376b8 100644
--- a/sword2/protocol.cpp
+++ b/sword2/protocol.cpp
@@ -17,15 +17,13 @@
  * $Header$
  */
 
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "console.h"
-#include "defs.h"
-#include "header.h"
-#include "memory.h"
-#include "protocol.h"
-#include "resman.h"
+#include "bs2/console.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/memory.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
 
 namespace Sword2 {
 
diff --git a/sword2/protocol.h b/sword2/protocol.h
index deebb3a911..fa822b848c 100644
--- a/sword2/protocol.h
+++ b/sword2/protocol.h
@@ -22,8 +22,8 @@
 #ifndef	_PROTOCOL
 #define	_PROTOCOL
 
-#include "driver/driver96.h"
-#include "header.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/header.h"
 
 namespace Sword2 {
 
diff --git a/sword2/resman.cpp b/sword2/resman.cpp
index 76ce70b31d..5e3f523f7e 100644
--- a/sword2/resman.cpp
+++ b/sword2/resman.cpp
@@ -17,31 +17,23 @@
  * $Header$
  */
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "stdafx.h"
-
-#include "base/engine.h"
-#include "common/file.h"
-
-#include "driver/driver96.h"
-#include "build_display.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"
-#include "function.h"
-#include "header.h"
-#include "interpreter.h"
-#include "maketext.h"
-#include "memory.h"
-#include "mouse.h"	// for system Set_mouse & Set_luggage routines
-#include "protocol.h"
-#include "resman.h"
-#include "sound.h"	// for Clear_fx_queue() called from cacheNewCluster()
-#include "sword2.h"	// for CloseGame()
-#include "router.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/function.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/maketext.h"
+#include "bs2/memory.h"
+#include "bs2/mouse.h"	// for system Set_mouse & Set_luggage routines
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sound.h"	// for Clear_fx_queue() called from cacheNewCluster()
+#include "bs2/sword2.h"	// for CloseGame()
+#include "bs2/router.h"
 
 namespace Sword2 {
 
diff --git a/sword2/resman.h b/sword2/resman.h
index e3c67287bb..522097a028 100644
--- a/sword2/resman.h
+++ b/sword2/resman.h
@@ -20,7 +20,7 @@
 #ifndef	RESMAN_H
 #define	RESMAN_H
 
-#include "memory.h"
+#include "bs2/memory.h"
 
 namespace Sword2 {
 
diff --git a/sword2/router.cpp b/sword2/router.cpp
index 17417a5a9f..5515ee33fa 100644
--- a/sword2/router.cpp
+++ b/sword2/router.cpp
@@ -78,16 +78,16 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"
-#include "header.h"
-#include "interpreter.h"
-#include "memory.h"
-#include "object.h"
-#include "resman.h"
-#include "router.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/memory.h"
+#include "bs2/object.h"
+#include "bs2/resman.h"
+#include "bs2/router.h"
 
 namespace Sword2 {
 
diff --git a/sword2/router.h b/sword2/router.h
index 9eecd3efc1..be9bea8e2f 100644
--- a/sword2/router.h
+++ b/sword2/router.h
@@ -20,8 +20,8 @@
 #ifndef _ROUTER_H
 #define _ROUTER_H
 
-#include "memory.h"
-#include "object.h"
+#include "bs2/memory.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 
diff --git a/sword2/save_rest.cpp b/sword2/save_rest.cpp
index a52b18cd26..5047a6c481 100644
--- a/sword2/save_rest.cpp
+++ b/sword2/save_rest.cpp
@@ -26,26 +26,24 @@
 //
 // ---------------------------------------------------------------------------
 
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "console.h"
-#include "defs.h"
-#include "function.h"		// for engine_logic, engine_graph, etc
-#include "interpreter.h"	// for IR_CONT, etc
-#include "layers.h"
-#include "logic.h"
-#include "memory.h"
-#include "object.h"
-#include "protocol.h"
-#include "resman.h"
-#include "router.h"
-#include "save_rest.h"
-#include "scroll.h"		// for Set_scrolling()
-#include "sound.h"
-#include "sword2.h"
-#include "walker.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/console.h"
+#include "bs2/defs.h"
+#include "bs2/function.h"	// for engine_logic, engine_graph, etc
+#include "bs2/interpreter.h"	// for IR_CONT, etc
+#include "bs2/layers.h"
+#include "bs2/logic.h"
+#include "bs2/memory.h"
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/router.h"
+#include "bs2/save_rest.h"
+#include "bs2/scroll.h"		// for Set_scrolling()
+#include "bs2/sound.h"
+#include "bs2/sword2.h"
+#include "bs2/walker.h"
 
 namespace Sword2 {
 
diff --git a/sword2/save_rest.h b/sword2/save_rest.h
index 13e9bc22ba..52a55ab156 100644
--- a/sword2/save_rest.h
+++ b/sword2/save_rest.h
@@ -20,7 +20,7 @@
 #ifndef	SAVE_REST_H
 #define	SAVE_REST_H
 
-#include "memory.h"
+#include "bs2/memory.h"
 
 namespace Sword2 {
 
diff --git a/sword2/scroll.cpp b/sword2/scroll.cpp
index 70e0ac8815..f8b3265bc7 100644
--- a/sword2/scroll.cpp
+++ b/sword2/scroll.cpp
@@ -18,13 +18,13 @@
  */
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "debug.h"
-#include "defs.h"
-#include "header.h"
-#include "interpreter.h"
-#include "layers.h"
-#include "scroll.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"
+#include "bs2/scroll.h"
 
 namespace Sword2 {
 
diff --git a/sword2/sound.cpp b/sword2/sound.cpp
index 22899c840f..2a9ddd8496 100644
--- a/sword2/sound.cpp
+++ b/sword2/sound.cpp
@@ -27,16 +27,14 @@
 //
 // ---------------------------------------------------------------------------
 
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "console.h"
-#include "defs.h"		// for RESULT
-#include "interpreter.h"
-#include "protocol.h"		// for FetchObjectName() for debugging FN_play_fx
-#include "resman.h"
-#include "sound.h"
-#include "sword2.h"
+#include "bs2/console.h"
+#include "bs2/defs.h"		// for RESULT
+#include "bs2/interpreter.h"
+#include "bs2/protocol.h"	// for FetchObjectName() for debugging FN_play_fx
+#include "bs2/resman.h"
+#include "bs2/sound.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 
diff --git a/sword2/sound.h b/sword2/sound.h
index 3c2a1f2890..327db16677 100644
--- a/sword2/sound.h
+++ b/sword2/sound.h
@@ -30,8 +30,6 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include "common/scummsys.h"
-
 namespace Sword2 {
 
 // fx types
diff --git a/sword2/speech.cpp b/sword2/speech.cpp
index 99137b557e..8c61702857 100644
--- a/sword2/speech.cpp
+++ b/sword2/speech.cpp
@@ -18,28 +18,26 @@
  */
 
 #include "stdafx.h"
-
-#include "stdafx.h"
-#include "anims.h"
-#include "console.h"
-#include "controls.h"	// for 'subtitles' & 'speechSelected'
-#include "debug.h"
-#include "defs.h"
-#include "events.h"
-#include "function.h"
-#include "interpreter.h"
-#include "layers.h"	// for 'this_screen'
-#include "logic.h"
-#include "maketext.h"
-#include "memory.h"
-#include "mouse.h"
-#include "object.h"
-#include "protocol.h"
-#include "resman.h"
-#include "sound.h"
-#include "speech.h"
-#include "sword2.h"
-#include "walker.h"
+#include "bs2/anims.h"
+#include "bs2/console.h"
+#include "bs2/controls.h"	// for 'subtitles' & 'speechSelected'
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"
+#include "bs2/function.h"
+#include "bs2/interpreter.h"
+#include "bs2/layers.h"		// for 'this_screen'
+#include "bs2/logic.h"
+#include "bs2/maketext.h"
+#include "bs2/memory.h"
+#include "bs2/mouse.h"
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/resman.h"
+#include "bs2/sound.h"
+#include "bs2/speech.h"
+#include "bs2/sword2.h"
+#include "bs2/walker.h"
 
 namespace Sword2 {
 
diff --git a/sword2/speech.h b/sword2/speech.h
index c5e2ef1e47..e510c5686f 100644
--- a/sword2/speech.h
+++ b/sword2/speech.h
@@ -20,7 +20,7 @@
 #ifndef	_SPEECH
 #define	_SPEECH
 
-#include "header.h"
+#include "bs2/header.h"
 
 namespace Sword2 {
 
diff --git a/sword2/startup.cpp b/sword2/startup.cpp
index c08a3bf805..c4bd03445a 100644
--- a/sword2/startup.cpp
+++ b/sword2/startup.cpp
@@ -17,27 +17,25 @@
  * $Header$
  */
 
-#include <stdio.h>
-
 #include "stdafx.h"
-#include "build_display.h"
-#include "console.h"
-#include "debug.h"
-#include "defs.h"
-#include "header.h"
-#include "interpreter.h"
-#include "maketext.h"		// for Kill_text_bloc()
-#include "memory.h"
-#include "mouse.h"		// for FN_add_human()
-#include "object.h"
-#include "resman.h"
-#include "router.h"
-#include "sound.h"
-#include "speech.h"		// for 'speech_text_bloc_no' - so that speech text can be cleared when running a new start-script
-#include "startup.h"
-#include "sword2.h"		// (James11aug97) for CloseGame()
-#include "sync.h"
-#include "tony_gsdk.h"
+#include "bs2/build_display.h"
+#include "bs2/console.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/header.h"
+#include "bs2/interpreter.h"
+#include "bs2/maketext.h"	// for Kill_text_bloc()
+#include "bs2/memory.h"
+#include "bs2/mouse.h"		// for FN_add_human()
+#include "bs2/object.h"
+#include "bs2/resman.h"
+#include "bs2/router.h"
+#include "bs2/sound.h"
+#include "bs2/speech.h"		// for 'speech_text_bloc_no' - so that speech text can be cleared when running a new start-script
+#include "bs2/startup.h"
+#include "bs2/sword2.h"		// for CloseGame()
+#include "bs2/sync.h"
+#include "bs2/tony_gsdk.h"
 
 namespace Sword2 {
 
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index 334a47ad09..2fbb5409c8 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -18,12 +18,9 @@
  */
 
 #include "stdafx.h"
-
 #include "base/gameDetector.h"
 #include "base/plugins.h"
-
 #include "common/config-file.h"
-
 #include "bs2/build_display.h"
 #include "bs2/console.h"
 #include "bs2/controls.h"
diff --git a/sword2/sword2.h b/sword2/sword2.h
index 7a9f9dfcf6..20e5310578 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -20,7 +20,12 @@
 #ifndef	_SWORD2
 #define	_SWORD2
 
-#include "driver/d_sound.h"
+#include "base/engine.h"
+#include "common/file.h"
+#include "common/map.h"
+#include "common/rect.h"
+#include "common/str.h"
+#include "bs2/driver/d_sound.h"
 
 enum BSGameId {
 	GID_SWORD2 = GID_SWORD2_FIRST,
diff --git a/sword2/sync.cpp b/sword2/sync.cpp
index 6c3d6503f2..c77059f02b 100644
--- a/sword2/sync.cpp
+++ b/sword2/sync.cpp
@@ -18,10 +18,11 @@
  */
 
 #include "stdafx.h"
-#include "debug.h"
-#include "defs.h"
-#include "interpreter.h"
-#include "sync.h"
+#include "common/util.h"
+#include "bs2/debug.h"
+#include "bs2/defs.h"
+#include "bs2/interpreter.h"
+#include "bs2/sync.h"
 
 namespace Sword2 {
 
diff --git a/sword2/sync.h b/sword2/sync.h
index a71e134cea..8bec326874 100644
--- a/sword2/sync.h
+++ b/sword2/sync.h
@@ -20,7 +20,7 @@
 #ifndef	_SYNC
 #define	_SYNC
 
-#include "object.h"
+#include "bs2/object.h"
 
 namespace Sword2 {
 
diff --git a/sword2/tony_gsdk.cpp b/sword2/tony_gsdk.cpp
index 5d09f688aa..118a0c90e7 100644
--- a/sword2/tony_gsdk.cpp
+++ b/sword2/tony_gsdk.cpp
@@ -20,12 +20,11 @@
 // general odds and ends
 
 #include "stdafx.h"
-#include "driver/driver96.h"
-#include "debug.h"
-#include "memory.h"
-#include "tony_gsdk.h"
-#include "sword2.h"
-#include "common/file.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/debug.h"
+#include "bs2/memory.h"
+#include "bs2/tony_gsdk.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 
diff --git a/sword2/tony_gsdk.h b/sword2/tony_gsdk.h
index b74e111af6..58f5025e53 100644
--- a/sword2/tony_gsdk.h
+++ b/sword2/tony_gsdk.h
@@ -20,7 +20,7 @@
 #ifndef	TONY_GSDK
 #define	TONY_GSDK
 
-#include "memory.h"
+#include "bs2/memory.h"
 
 namespace Sword2 {
 
diff --git a/sword2/walker.cpp b/sword2/walker.cpp
index f5322aee07..afc5c932a4 100644
--- a/sword2/walker.cpp
+++ b/sword2/walker.cpp
@@ -34,16 +34,16 @@
 // FN_get_pos()			// get details of another mega's position
 
 #include "stdafx.h"
-#include "console.h"
-#include "defs.h"
-#include "events.h"
-#include "function.h"
-#include "interpreter.h"
-#include "logic.h"		// for FN_add_to_kill_list
-#include "object.h"
-#include "protocol.h"
-#include "router.h"
-#include "sync.h"
+#include "bs2/console.h"
+#include "bs2/defs.h"
+#include "bs2/events.h"
+#include "bs2/function.h"
+#include "bs2/interpreter.h"
+#include "bs2/logic.h"		// for FN_add_to_kill_list
+#include "bs2/object.h"
+#include "bs2/protocol.h"
+#include "bs2/router.h"
+#include "bs2/sync.h"
 
 namespace Sword2 {
 
-- 
cgit v1.2.3