Project files update

svn-id: r11499

5 files changed, 6311 insertions, 3630 deletions

diff --git a/dists/msevc3/scumm.vcp b/dists/msevc3/scumm.vcp
index 41800724f7..e75df692fa 100644
--- a/dists/msevc3/scumm.vcp
+++ b/dists/msevc3/scumm.vcp
@@ -52,15 +52,15 @@ CFG=scumm - Win32 (WCE MIPS) Debug
 # PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "WIN32" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "DISABLE_QUEEN" /YX /Oxs /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clmips.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "WIN32" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "DISABLE_QUEEN" /YX /Oxs /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
@@ -78,15 +78,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "NONSTANDARD_PORT" /YX /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clmips.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "NONSTANDARD_PORT" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
@@ -105,8 +105,8 @@ BSC32=bscmake.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "WIN32" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "DISABLE_QUEEN" /YX /Oxs /M$(CECrtMT) /c
+# ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /Oxs /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "WIN32" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "DISABLE_QUEEN" /YX /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -156,15 +156,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "DISABLE_QUEEN" /FR /YX /Oxs /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /GX  /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "DISABLE_QUEEN" /FR /YX /Oxs /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
@@ -182,15 +182,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "NDEBUG" /D "WIN32" /D "USE_VORBIS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "DISABLE_QUEEN" /YX /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "NDEBUG" /D "WIN32" /D "USE_VORBIS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "DISABLE_QUEEN" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
@@ -208,15 +208,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Oxs /Gz /c
-# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Oxs /Gz /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Oxs /Gz /c
+# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Oxs /Gz /c
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
@@ -234,15 +234,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gz /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gz /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gz /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gz /c
 
 !ENDIF 
 
@@ -284,11 +284,11 @@ DEP_CPP_CHUNK=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\scumm\smush\chunk.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHUNK=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -305,11 +305,11 @@ DEP_CPP_CHUNK=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\scumm\smush\chunk.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHUNK=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -326,11 +326,11 @@ DEP_CPP_CHUNK=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\scumm\smush\chunk.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHUNK=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -347,11 +347,11 @@ DEP_CPP_CHUNK=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\scumm\smush\chunk.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHUNK=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -368,11 +368,11 @@ DEP_CPP_CHUNK=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\scumm\smush\chunk.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHUNK=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -389,11 +389,11 @@ DEP_CPP_CHUNK=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\scumm\smush\chunk.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHUNK=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -438,11 +438,11 @@ DEP_CPP_CODEC=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -452,11 +452,11 @@ DEP_CPP_CODEC=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -466,11 +466,11 @@ DEP_CPP_CODEC=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -480,11 +480,11 @@ DEP_CPP_CODEC=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -494,11 +494,11 @@ DEP_CPP_CODEC=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -508,11 +508,11 @@ DEP_CPP_CODEC=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -548,11 +548,11 @@ DEP_CPP_CODEC3=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec37.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -567,11 +567,11 @@ DEP_CPP_CODEC3=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec37.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -586,11 +586,11 @@ DEP_CPP_CODEC3=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec37.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -605,11 +605,11 @@ DEP_CPP_CODEC3=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec37.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -624,11 +624,11 @@ DEP_CPP_CODEC3=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec37.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -643,11 +643,11 @@ DEP_CPP_CODEC3=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec37.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -691,12 +691,12 @@ DEP_CPP_CODEC4=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec47.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC4=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\smush\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -711,12 +711,12 @@ DEP_CPP_CODEC4=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec47.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC4=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\smush\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -731,12 +731,12 @@ DEP_CPP_CODEC4=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec47.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC4=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\smush\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -751,12 +751,12 @@ DEP_CPP_CODEC4=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec47.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC4=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\smush\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -771,12 +771,12 @@ DEP_CPP_CODEC4=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec47.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC4=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\smush\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -791,12 +791,12 @@ DEP_CPP_CODEC4=\
 	"..\..\common\util.h"\
 	"..\..\scumm\bomp.h"\
 	"..\..\scumm\smush\codec47.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CODEC4=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\smush\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -843,11 +843,11 @@ DEP_CPP_IMUSE=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -863,11 +863,11 @@ DEP_CPP_IMUSE=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -883,11 +883,11 @@ DEP_CPP_IMUSE=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -903,11 +903,11 @@ DEP_CPP_IMUSE=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -923,11 +923,11 @@ DEP_CPP_IMUSE=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -943,11 +943,11 @@ DEP_CPP_IMUSE=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -988,11 +988,11 @@ DEP_CPP_SAUD_=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAUD_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -1008,11 +1008,11 @@ DEP_CPP_SAUD_=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAUD_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -1028,11 +1028,11 @@ DEP_CPP_SAUD_=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAUD_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -1048,11 +1048,11 @@ DEP_CPP_SAUD_=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAUD_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -1068,11 +1068,11 @@ DEP_CPP_SAUD_=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAUD_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -1088,11 +1088,11 @@ DEP_CPP_SAUD_=\
 	"..\..\scumm\smush\channel.h"\
 	"..\..\scumm\smush\chunk.h"\
 	"..\..\scumm\smush\chunk_type.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAUD_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -1141,11 +1141,11 @@ DEP_CPP_SMUSH=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\smush\smush_font.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SMUSH=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -1169,11 +1169,11 @@ DEP_CPP_SMUSH=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\smush\smush_font.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SMUSH=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -1197,11 +1197,11 @@ DEP_CPP_SMUSH=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\smush\smush_font.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SMUSH=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -1225,11 +1225,11 @@ DEP_CPP_SMUSH=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\smush\smush_font.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SMUSH=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -1253,11 +1253,11 @@ DEP_CPP_SMUSH=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\smush\smush_font.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SMUSH=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -1281,11 +1281,11 @@ DEP_CPP_SMUSH=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\smush\smush_font.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SMUSH=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -1342,17 +1342,17 @@ DEP_CPP_SMUSH_=\
 	"..\..\scumm\smush\smush_mixer.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -1380,17 +1380,17 @@ DEP_CPP_SMUSH_=\
 	"..\..\scumm\smush\smush_mixer.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -1418,17 +1418,17 @@ DEP_CPP_SMUSH_=\
 	"..\..\scumm\smush\smush_mixer.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -1456,17 +1456,17 @@ DEP_CPP_SMUSH_=\
 	"..\..\scumm\smush\smush_mixer.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -1494,17 +1494,17 @@ DEP_CPP_SMUSH_=\
 	"..\..\scumm\smush\smush_mixer.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -1532,17 +1532,17 @@ DEP_CPP_SMUSH_=\
 	"..\..\scumm\smush\smush_mixer.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -1617,18 +1617,18 @@ DEP_CPP_SMUSH_P=\
 	"..\..\scumm\smush\smush_player.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -1666,18 +1666,18 @@ DEP_CPP_SMUSH_P=\
 	"..\..\scumm\smush\smush_player.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -1715,18 +1715,18 @@ DEP_CPP_SMUSH_P=\
 	"..\..\scumm\smush\smush_player.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -1764,18 +1764,18 @@ DEP_CPP_SMUSH_P=\
 	"..\..\scumm\smush\smush_player.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -1813,18 +1813,18 @@ DEP_CPP_SMUSH_P=\
 	"..\..\scumm\smush\smush_player.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -1862,18 +1862,18 @@ DEP_CPP_SMUSH_P=\
 	"..\..\scumm\smush\smush_player.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMUSH_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -1962,17 +1962,17 @@ DEP_CPP_ACTOR=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\usage_bits.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ACTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -2005,17 +2005,17 @@ DEP_CPP_ACTOR=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\usage_bits.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ACTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -2048,17 +2048,17 @@ DEP_CPP_ACTOR=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\usage_bits.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ACTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -2091,17 +2091,17 @@ DEP_CPP_ACTOR=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\usage_bits.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ACTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -2134,17 +2134,17 @@ DEP_CPP_ACTOR=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\usage_bits.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ACTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -2177,17 +2177,17 @@ DEP_CPP_ACTOR=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\usage_bits.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ACTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -2260,18 +2260,18 @@ DEP_CPP_AKOS_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_AKOS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -2301,18 +2301,18 @@ DEP_CPP_AKOS_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_AKOS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -2342,18 +2342,18 @@ DEP_CPP_AKOS_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_AKOS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -2383,18 +2383,18 @@ DEP_CPP_AKOS_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_AKOS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -2424,18 +2424,18 @@ DEP_CPP_AKOS_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_AKOS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -2465,18 +2465,18 @@ DEP_CPP_AKOS_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_AKOS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -2537,11 +2537,11 @@ DEP_CPP_BASE_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BASE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -2565,11 +2565,11 @@ DEP_CPP_BASE_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BASE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -2593,11 +2593,11 @@ DEP_CPP_BASE_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BASE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -2621,11 +2621,11 @@ DEP_CPP_BASE_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BASE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -2649,11 +2649,11 @@ DEP_CPP_BASE_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BASE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -2677,11 +2677,11 @@ DEP_CPP_BASE_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BASE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -2732,11 +2732,11 @@ DEP_CPP_BOMP_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOMP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -2762,11 +2762,11 @@ DEP_CPP_BOMP_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOMP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -2792,11 +2792,11 @@ DEP_CPP_BOMP_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOMP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -2822,11 +2822,11 @@ DEP_CPP_BOMP_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOMP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -2852,11 +2852,11 @@ DEP_CPP_BOMP_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOMP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -2882,11 +2882,11 @@ DEP_CPP_BOMP_=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOMP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -2939,11 +2939,11 @@ DEP_CPP_BOXES=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOXES=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -2967,11 +2967,11 @@ DEP_CPP_BOXES=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOXES=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -2995,11 +2995,11 @@ DEP_CPP_BOXES=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOXES=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -3023,11 +3023,11 @@ DEP_CPP_BOXES=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOXES=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -3051,11 +3051,11 @@ DEP_CPP_BOXES=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOXES=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -3079,11 +3079,11 @@ DEP_CPP_BOXES=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOXES=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -3137,12 +3137,12 @@ DEP_CPP_BUNDL=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BUNDL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -3165,12 +3165,12 @@ DEP_CPP_BUNDL=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BUNDL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -3193,12 +3193,12 @@ DEP_CPP_BUNDL=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BUNDL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -3221,12 +3221,12 @@ DEP_CPP_BUNDL=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BUNDL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -3249,12 +3249,12 @@ DEP_CPP_BUNDL=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BUNDL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -3277,12 +3277,12 @@ DEP_CPP_BUNDL=\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BUNDL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -3338,11 +3338,11 @@ DEP_CPP_CAMER=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CAMER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -3367,11 +3367,11 @@ DEP_CPP_CAMER=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CAMER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -3396,11 +3396,11 @@ DEP_CPP_CAMER=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CAMER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -3425,11 +3425,11 @@ DEP_CPP_CAMER=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CAMER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -3454,11 +3454,11 @@ DEP_CPP_CAMER=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CAMER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -3483,11 +3483,11 @@ DEP_CPP_CAMER=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CAMER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -3539,12 +3539,12 @@ DEP_CPP_CHARS=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -3569,12 +3569,12 @@ DEP_CPP_CHARS=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -3599,12 +3599,12 @@ DEP_CPP_CHARS=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -3629,12 +3629,12 @@ DEP_CPP_CHARS=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -3659,12 +3659,12 @@ DEP_CPP_CHARS=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -3689,12 +3689,12 @@ DEP_CPP_CHARS=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -3754,18 +3754,18 @@ DEP_CPP_COSTU=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_COSTU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -3792,18 +3792,18 @@ DEP_CPP_COSTU=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_COSTU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -3830,18 +3830,18 @@ DEP_CPP_COSTU=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_COSTU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -3868,18 +3868,18 @@ DEP_CPP_COSTU=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_COSTU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -3906,18 +3906,18 @@ DEP_CPP_COSTU=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_COSTU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -3944,18 +3944,18 @@ DEP_CPP_COSTU=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_COSTU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -4023,17 +4023,17 @@ DEP_CPP_DEBUG=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -4068,17 +4068,17 @@ DEP_CPP_DEBUG=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -4113,17 +4113,17 @@ DEP_CPP_DEBUG=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -4158,17 +4158,17 @@ DEP_CPP_DEBUG=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -4203,17 +4203,17 @@ DEP_CPP_DEBUG=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -4248,17 +4248,17 @@ DEP_CPP_DEBUG=\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -4342,18 +4342,18 @@ DEP_CPP_DIALO=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DIALO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -4392,18 +4392,18 @@ DEP_CPP_DIALO=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DIALO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -4442,18 +4442,18 @@ DEP_CPP_DIALO=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DIALO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -4492,18 +4492,18 @@ DEP_CPP_DIALO=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DIALO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -4542,18 +4542,18 @@ DEP_CPP_DIALO=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DIALO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -4592,18 +4592,18 @@ DEP_CPP_DIALO=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DIALO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -4681,12 +4681,12 @@ DEP_CPP_GFX_C=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GFX_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -4713,12 +4713,12 @@ DEP_CPP_GFX_C=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GFX_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -4745,12 +4745,12 @@ DEP_CPP_GFX_C=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GFX_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -4777,12 +4777,12 @@ DEP_CPP_GFX_C=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GFX_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -4809,12 +4809,12 @@ DEP_CPP_GFX_C=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GFX_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -4841,12 +4841,12 @@ DEP_CPP_GFX_C=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GFX_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -4908,11 +4908,11 @@ DEP_CPP_HELP_=\
 	"..\..\scumm\help.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HELP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -4935,11 +4935,11 @@ DEP_CPP_HELP_=\
 	"..\..\scumm\help.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HELP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -4962,11 +4962,11 @@ DEP_CPP_HELP_=\
 	"..\..\scumm\help.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HELP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -4989,11 +4989,11 @@ DEP_CPP_HELP_=\
 	"..\..\scumm\help.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HELP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -5016,11 +5016,11 @@ DEP_CPP_HELP_=\
 	"..\..\scumm\help.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HELP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -5043,11 +5043,11 @@ DEP_CPP_HELP_=\
 	"..\..\scumm\help.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HELP_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -5105,11 +5105,11 @@ DEP_CPP_IMUSE_=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -5138,11 +5138,11 @@ DEP_CPP_IMUSE_=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -5171,11 +5171,11 @@ DEP_CPP_IMUSE_=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -5204,11 +5204,11 @@ DEP_CPP_IMUSE_=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -5237,11 +5237,11 @@ DEP_CPP_IMUSE_=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -5270,11 +5270,11 @@ DEP_CPP_IMUSE_=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -5341,19 +5341,19 @@ DEP_CPP_IMUSE_D=\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_IMUSE_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -5381,19 +5381,19 @@ DEP_CPP_IMUSE_D=\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_IMUSE_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -5421,19 +5421,19 @@ DEP_CPP_IMUSE_D=\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_IMUSE_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -5461,19 +5461,19 @@ DEP_CPP_IMUSE_D=\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_IMUSE_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -5501,19 +5501,19 @@ DEP_CPP_IMUSE_D=\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_IMUSE_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -5541,19 +5541,19 @@ DEP_CPP_IMUSE_D=\
 	"..\..\scumm\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_IMUSE_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -5621,11 +5621,11 @@ DEP_CPP_IMUSE_P=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -5652,11 +5652,11 @@ DEP_CPP_IMUSE_P=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -5683,11 +5683,11 @@ DEP_CPP_IMUSE_P=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -5714,11 +5714,11 @@ DEP_CPP_IMUSE_P=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -5745,11 +5745,11 @@ DEP_CPP_IMUSE_P=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -5776,11 +5776,11 @@ DEP_CPP_IMUSE_P=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_P=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -5836,11 +5836,11 @@ DEP_CPP_INSTR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INSTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -5865,11 +5865,11 @@ DEP_CPP_INSTR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INSTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -5894,11 +5894,11 @@ DEP_CPP_INSTR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INSTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -5923,11 +5923,11 @@ DEP_CPP_INSTR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INSTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -5952,11 +5952,11 @@ DEP_CPP_INSTR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INSTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -5981,11 +5981,11 @@ DEP_CPP_INSTR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INSTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -6035,11 +6035,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -6054,11 +6054,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -6073,11 +6073,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -6092,11 +6092,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -6111,11 +6111,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -6130,11 +6130,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -6174,11 +6174,11 @@ DEP_CPP_MIDIPA=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -6193,11 +6193,11 @@ DEP_CPP_MIDIPA=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -6212,11 +6212,11 @@ DEP_CPP_MIDIPA=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -6231,11 +6231,11 @@ DEP_CPP_MIDIPA=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -6250,11 +6250,11 @@ DEP_CPP_MIDIPA=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -6269,11 +6269,11 @@ DEP_CPP_MIDIPA=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -6326,11 +6326,11 @@ DEP_CPP_NUT_R=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NUT_R=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -6354,11 +6354,11 @@ DEP_CPP_NUT_R=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NUT_R=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -6382,11 +6382,11 @@ DEP_CPP_NUT_R=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NUT_R=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -6410,11 +6410,11 @@ DEP_CPP_NUT_R=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NUT_R=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -6438,11 +6438,11 @@ DEP_CPP_NUT_R=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NUT_R=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -6466,11 +6466,11 @@ DEP_CPP_NUT_R=\
 	"..\..\scumm\nut_renderer.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NUT_R=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -6526,11 +6526,11 @@ DEP_CPP_OBJEC=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -6557,11 +6557,11 @@ DEP_CPP_OBJEC=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -6588,11 +6588,11 @@ DEP_CPP_OBJEC=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -6619,11 +6619,11 @@ DEP_CPP_OBJEC=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -6650,11 +6650,11 @@ DEP_CPP_OBJEC=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -6681,11 +6681,11 @@ DEP_CPP_OBJEC=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -6746,17 +6746,17 @@ DEP_CPP_PLAYE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -6782,17 +6782,17 @@ DEP_CPP_PLAYE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -6818,17 +6818,17 @@ DEP_CPP_PLAYE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -6854,17 +6854,17 @@ DEP_CPP_PLAYE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -6890,17 +6890,17 @@ DEP_CPP_PLAYE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -6926,17 +6926,17 @@ DEP_CPP_PLAYE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -6984,11 +6984,11 @@ DEP_CPP_PLAYER=\
 	"..\..\scumm\player_v2.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_PLAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -7013,11 +7013,11 @@ DEP_CPP_PLAYER=\
 	"..\..\scumm\player_v2.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_PLAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -7042,11 +7042,11 @@ DEP_CPP_PLAYER=\
 	"..\..\scumm\player_v2.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_PLAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -7071,11 +7071,11 @@ DEP_CPP_PLAYER=\
 	"..\..\scumm\player_v2.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_PLAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -7100,11 +7100,11 @@ DEP_CPP_PLAYER=\
 	"..\..\scumm\player_v2.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_PLAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -7129,11 +7129,11 @@ DEP_CPP_PLAYER=\
 	"..\..\scumm\player_v2.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_PLAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -7188,18 +7188,18 @@ DEP_CPP_PLAYER_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -7225,18 +7225,18 @@ DEP_CPP_PLAYER_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -7262,18 +7262,18 @@ DEP_CPP_PLAYER_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -7299,18 +7299,18 @@ DEP_CPP_PLAYER_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -7336,18 +7336,18 @@ DEP_CPP_PLAYER_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -7373,18 +7373,18 @@ DEP_CPP_PLAYER_=\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\scumm\scumm_globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -7447,17 +7447,17 @@ DEP_CPP_PLAYER_V=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -7485,17 +7485,17 @@ DEP_CPP_PLAYER_V=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -7523,17 +7523,17 @@ DEP_CPP_PLAYER_V=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -7561,17 +7561,17 @@ DEP_CPP_PLAYER_V=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -7599,17 +7599,17 @@ DEP_CPP_PLAYER_V=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -7637,17 +7637,17 @@ DEP_CPP_PLAYER_V=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -7704,17 +7704,17 @@ DEP_CPP_PLAYER_V3=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -7742,17 +7742,17 @@ DEP_CPP_PLAYER_V3=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -7780,17 +7780,17 @@ DEP_CPP_PLAYER_V3=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -7818,17 +7818,17 @@ DEP_CPP_PLAYER_V3=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -7856,17 +7856,17 @@ DEP_CPP_PLAYER_V3=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -7894,17 +7894,17 @@ DEP_CPP_PLAYER_V3=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PLAYER_V3=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -7970,17 +7970,17 @@ DEP_CPP_RESOU=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -8017,17 +8017,17 @@ DEP_CPP_RESOU=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -8064,17 +8064,17 @@ DEP_CPP_RESOU=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -8111,17 +8111,17 @@ DEP_CPP_RESOU=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -8158,17 +8158,17 @@ DEP_CPP_RESOU=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -8205,17 +8205,17 @@ DEP_CPP_RESOU=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -8290,11 +8290,11 @@ DEP_CPP_RESOUR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOUR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -8322,11 +8322,11 @@ DEP_CPP_RESOUR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOUR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -8354,11 +8354,11 @@ DEP_CPP_RESOUR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOUR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -8386,11 +8386,11 @@ DEP_CPP_RESOUR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOUR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -8418,11 +8418,11 @@ DEP_CPP_RESOUR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOUR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -8450,11 +8450,11 @@ DEP_CPP_RESOUR=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOUR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -8509,11 +8509,11 @@ DEP_CPP_RESOURC=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -8537,11 +8537,11 @@ DEP_CPP_RESOURC=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -8565,11 +8565,11 @@ DEP_CPP_RESOURC=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -8593,11 +8593,11 @@ DEP_CPP_RESOURC=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -8621,11 +8621,11 @@ DEP_CPP_RESOURC=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -8649,11 +8649,11 @@ DEP_CPP_RESOURC=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -8701,11 +8701,11 @@ DEP_CPP_RESOURCE=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURCE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -8728,11 +8728,11 @@ DEP_CPP_RESOURCE=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURCE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -8755,11 +8755,11 @@ DEP_CPP_RESOURCE=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURCE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -8782,11 +8782,11 @@ DEP_CPP_RESOURCE=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURCE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -8809,11 +8809,11 @@ DEP_CPP_RESOURCE=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURCE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -8836,11 +8836,11 @@ DEP_CPP_RESOURCE=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURCE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -8898,17 +8898,17 @@ DEP_CPP_SAVEL=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SAVEL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -8943,17 +8943,17 @@ DEP_CPP_SAVEL=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SAVEL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -8988,17 +8988,17 @@ DEP_CPP_SAVEL=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SAVEL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -9033,17 +9033,17 @@ DEP_CPP_SAVEL=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SAVEL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -9078,17 +9078,17 @@ DEP_CPP_SAVEL=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SAVEL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -9123,17 +9123,17 @@ DEP_CPP_SAVEL=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SAVEL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -9205,11 +9205,11 @@ DEP_CPP_SCRIP=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCRIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -9234,11 +9234,11 @@ DEP_CPP_SCRIP=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCRIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -9263,11 +9263,11 @@ DEP_CPP_SCRIP=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCRIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -9292,11 +9292,11 @@ DEP_CPP_SCRIP=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCRIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -9321,11 +9321,11 @@ DEP_CPP_SCRIP=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCRIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -9350,11 +9350,11 @@ DEP_CPP_SCRIP=\
 	"..\..\scumm\resource.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCRIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -9416,17 +9416,17 @@ DEP_CPP_SCRIPT=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -9455,17 +9455,17 @@ DEP_CPP_SCRIPT=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -9494,17 +9494,17 @@ DEP_CPP_SCRIPT=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -9533,17 +9533,17 @@ DEP_CPP_SCRIPT=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -9572,17 +9572,17 @@ DEP_CPP_SCRIPT=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -9611,17 +9611,17 @@ DEP_CPP_SCRIPT=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -9683,17 +9683,17 @@ DEP_CPP_SCRIPT_=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -9722,17 +9722,17 @@ DEP_CPP_SCRIPT_=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -9761,17 +9761,17 @@ DEP_CPP_SCRIPT_=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -9800,17 +9800,17 @@ DEP_CPP_SCRIPT_=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -9839,17 +9839,17 @@ DEP_CPP_SCRIPT_=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -9878,17 +9878,17 @@ DEP_CPP_SCRIPT_=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -9963,17 +9963,17 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -10015,17 +10015,17 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -10067,17 +10067,17 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -10119,17 +10119,17 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -10171,17 +10171,17 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -10223,17 +10223,17 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -10314,17 +10314,17 @@ DEP_CPP_SCRIPT_V8=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V8=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -10360,17 +10360,17 @@ DEP_CPP_SCRIPT_V8=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V8=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -10406,17 +10406,17 @@ DEP_CPP_SCRIPT_V8=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V8=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -10452,17 +10452,17 @@ DEP_CPP_SCRIPT_V8=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V8=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -10498,17 +10498,17 @@ DEP_CPP_SCRIPT_V8=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V8=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -10544,17 +10544,17 @@ DEP_CPP_SCRIPT_V8=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCRIPT_V8=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -10657,17 +10657,17 @@ DEP_CPP_SCUMM=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCUMM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -10725,17 +10725,17 @@ DEP_CPP_SCUMM=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCUMM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -10793,17 +10793,17 @@ DEP_CPP_SCUMM=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCUMM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -10861,17 +10861,17 @@ DEP_CPP_SCUMM=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCUMM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -10929,17 +10929,17 @@ DEP_CPP_SCUMM=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCUMM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -10997,17 +10997,17 @@ DEP_CPP_SCUMM=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCUMM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -11115,18 +11115,18 @@ DEP_CPP_SOUND=\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -11161,18 +11161,18 @@ DEP_CPP_SOUND=\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -11207,18 +11207,18 @@ DEP_CPP_SOUND=\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -11253,18 +11253,18 @@ DEP_CPP_SOUND=\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -11299,18 +11299,18 @@ DEP_CPP_SOUND=\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -11345,18 +11345,18 @@ DEP_CPP_SOUND=\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -11437,17 +11437,17 @@ DEP_CPP_STRIN=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -11479,17 +11479,17 @@ DEP_CPP_STRIN=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -11521,17 +11521,17 @@ DEP_CPP_STRIN=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -11563,17 +11563,17 @@ DEP_CPP_STRIN=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -11605,17 +11605,17 @@ DEP_CPP_STRIN=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -11647,17 +11647,17 @@ DEP_CPP_STRIN=\
 	"..\..\scumm\sound.h"\
 	"..\..\scumm\verbs.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -11711,11 +11711,11 @@ DEP_CPP_USAGE=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -11738,11 +11738,11 @@ DEP_CPP_USAGE=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -11765,11 +11765,11 @@ DEP_CPP_USAGE=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -11792,11 +11792,11 @@ DEP_CPP_USAGE=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -11819,11 +11819,11 @@ DEP_CPP_USAGE=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -11846,11 +11846,11 @@ DEP_CPP_USAGE=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -11900,11 +11900,11 @@ DEP_CPP_VARS_=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -11927,11 +11927,11 @@ DEP_CPP_VARS_=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -11954,11 +11954,11 @@ DEP_CPP_VARS_=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -11981,11 +11981,11 @@ DEP_CPP_VARS_=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -12008,11 +12008,11 @@ DEP_CPP_VARS_=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -12035,11 +12035,11 @@ DEP_CPP_VARS_=\
 	"..\..\scumm\intern.h"\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -12088,11 +12088,11 @@ DEP_CPP_VERBS=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\verbs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -12118,11 +12118,11 @@ DEP_CPP_VERBS=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\verbs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -12148,11 +12148,11 @@ DEP_CPP_VERBS=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\verbs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -12178,11 +12178,11 @@ DEP_CPP_VERBS=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\verbs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
@@ -12208,11 +12208,11 @@ DEP_CPP_VERBS=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\verbs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
@@ -12238,11 +12238,11 @@ DEP_CPP_VERBS=\
 	"..\..\scumm\script.h"\
 	"..\..\scumm\scumm.h"\
 	"..\..\scumm\verbs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
diff --git a/dists/msevc3/scummvm.vcp b/dists/msevc3/scummvm.vcp
index ee236ed219..fc0f136796 100644
--- a/dists/msevc3/scummvm.vcp
+++ b/dists/msevc3/scummvm.vcp
@@ -194,7 +194,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /O2 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "WIN32" /D "USE_VORBIS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "DISABLE_QUEEN" /FR /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "WIN32" /D "USE_VORBIS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "DISABLE_QUEEN" /FR /YX /Oxs /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -503,11 +503,11 @@ DEP_CPP_DEBUG=\
 	"..\..\gui\dialog.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
@@ -527,11 +527,11 @@ DEP_CPP_DEBUG=\
 	"..\..\gui\dialog.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
@@ -551,11 +551,11 @@ DEP_CPP_DEBUG=\
 	"..\..\gui\dialog.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
@@ -575,11 +575,11 @@ DEP_CPP_DEBUG=\
 	"..\..\gui\dialog.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
@@ -597,6 +597,7 @@ DEP_CPP_DEBUG=\
 	"..\..\common\system.h"\
 	"..\..\gui\console.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
@@ -623,11 +624,11 @@ DEP_CPP_DEBUG=\
 	"..\..\gui\dialog.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
@@ -896,6 +897,8 @@ DEP_CPP_SAVEF=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"zconf.h"\
+	{$(INCLUDE)}"zlib.h"\
 	
 NODEP_CPP_SAVEF=\
 	"..\..\common\config.h"\
@@ -1074,11 +1077,11 @@ DEP_CPP_SYSTE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SYSTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
@@ -1098,11 +1101,11 @@ DEP_CPP_SYSTE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SYSTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
@@ -1122,11 +1125,11 @@ DEP_CPP_SYSTE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SYSTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
@@ -1146,11 +1149,11 @@ DEP_CPP_SYSTE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SYSTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
@@ -1194,11 +1197,11 @@ DEP_CPP_SYSTE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SYSTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
@@ -1462,11 +1465,238 @@ SOURCE=..\..\common\util.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\sound\audiostream.cpp
+SOURCE=..\..\sound\audiocd.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_AUDIO=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\base\engine.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_AUDIO=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_AUDIO=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\base\engine.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_AUDIO=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_AUDIO=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\base\engine.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_AUDIO=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_AUDIO=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\base\engine.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_AUDIO=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_AUDIO=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\base\engine.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_AUDIO=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_AUDIO=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\base\engine.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_AUDIO=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
+
+NODEP_CPP_AUDIO=\
+	"..\..\sound\base\engine.h"\
+	"..\..\sound\common\file.h"\
+	"..\..\sound\common\util.h"\
+	"..\..\sound\sound\audiocd.h"\
+	"..\..\sound\sound\mp3.h"\
+	"..\..\sound\sound\vorbis.h"\
+	"..\..\sound\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Debug"
+
+NODEP_CPP_AUDIO=\
+	"..\..\sound\base\engine.h"\
+	"..\..\sound\common\file.h"\
+	"..\..\sound\common\util.h"\
+	"..\..\sound\sound\audiocd.h"\
+	"..\..\sound\sound\mp3.h"\
+	"..\..\sound\sound\vorbis.h"\
+	"..\..\sound\stdafx.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\audiocd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\audiostream.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_AUDIOS=\
 	"..\..\..\vorbis\config_types.h"\
 	"..\..\..\vorbis\ivorbiscodec.h"\
 	"..\..\..\vorbis\ogg.h"\
@@ -1475,7 +1705,7 @@ DEP_CPP_AUDIO=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_AUDIOS=\
 	"..\..\sound\base\engine.h"\
 	"..\..\sound\common\file.h"\
 	"..\..\sound\common\scummsys.h"\
@@ -1487,11 +1717,11 @@ NODEP_CPP_AUDIO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_AUDIOS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_AUDIOS=\
 	"..\..\sound\base\engine.h"\
 	"..\..\sound\common\file.h"\
 	"..\..\sound\common\scummsys.h"\
@@ -1508,7 +1738,7 @@ NODEP_CPP_AUDIO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_AUDIOS=\
 	"..\..\..\vorbis\config_types.h"\
 	"..\..\..\vorbis\ivorbiscodec.h"\
 	"..\..\..\vorbis\ogg.h"\
@@ -1517,7 +1747,7 @@ DEP_CPP_AUDIO=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_AUDIOS=\
 	"..\..\sound\base\engine.h"\
 	"..\..\sound\common\file.h"\
 	"..\..\sound\common\scummsys.h"\
@@ -1529,11 +1759,11 @@ NODEP_CPP_AUDIO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_AUDIOS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_AUDIOS=\
 	"..\..\sound\base\engine.h"\
 	"..\..\sound\common\file.h"\
 	"..\..\sound\common\scummsys.h"\
@@ -1550,7 +1780,7 @@ NODEP_CPP_AUDIO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_AUDIOS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
@@ -1572,14 +1802,14 @@ DEP_CPP_AUDIO=\
 	{$(INCLUDE)}"vorbis\os_types.h"\
 	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_AUDIOS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_AUDIOS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\file.h"\
@@ -1593,7 +1823,7 @@ DEP_CPP_AUDIO=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_AUDIOS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\sound\stdafx.h"\
@@ -1608,11 +1838,11 @@ NODEP_CPP_AUDIO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_AUDIOS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_AUDIOS=\
 	"..\..\sound\base\engine.h"\
 	"..\..\sound\common\file.h"\
 	"..\..\sound\common\scummsys.h"\
@@ -1623,11 +1853,11 @@ NODEP_CPP_AUDIO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_AUDIOS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_AUDIOS=\
 	"..\..\sound\base\engine.h"\
 	"..\..\sound\common\file.h"\
 	"..\..\sound\common\scummsys.h"\
@@ -2453,6 +2683,215 @@ SOURCE=..\..\sound\mixer.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\sound\mp3.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_MP3_C=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_MP3_C=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_MP3_C=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_MP3_C=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_MP3_C=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_MP3_C=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_MP3_C=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_MP3_C=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_MP3_C=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_MP3_C=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MP3_C=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\mp3.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_MP3_C=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
+
+NODEP_CPP_MP3_C=\
+	"..\..\sound\common\file.h"\
+	"..\..\sound\common\util.h"\
+	"..\..\sound\sound\mp3.h"\
+	"..\..\sound\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Debug"
+
+NODEP_CPP_MP3_C=\
+	"..\..\sound\common\file.h"\
+	"..\..\sound\common\util.h"\
+	"..\..\sound\sound\mp3.h"\
+	"..\..\sound\stdafx.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\mp3.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\sound\mpu401.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
@@ -2918,6 +3357,215 @@ NODEP_CPP_VOC_C=\
 
 SOURCE=..\..\sound\voc.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\vorbis.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_VORBI=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_VORBI=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_VORBI=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_VORBI=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_VORBI=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_VORBI=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_VORBI=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_VORBI=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_VORBI=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_VORBI=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_VORBI=\
+	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
+	"..\..\common\file.h"\
+	"..\..\common\list.h"\
+	"..\..\common\savefile.h"\
+	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
+	"..\..\common\stdafx.h"\
+	"..\..\common\str.h"\
+	"..\..\common\system.h"\
+	"..\..\common\util.h"\
+	"..\..\sound\audiocd.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_VORBI=\
+	"..\..\common\config.h"\
+	"..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
+
+NODEP_CPP_VORBI=\
+	"..\..\sound\common\file.h"\
+	"..\..\sound\common\util.h"\
+	"..\..\sound\sound\vorbis.h"\
+	"..\..\sound\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Debug"
+
+NODEP_CPP_VORBI=\
+	"..\..\sound\common\file.h"\
+	"..\..\sound\common\util.h"\
+	"..\..\sound\sound\vorbis.h"\
+	"..\..\sound\stdafx.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\vorbis.h
+# End Source File
 # End Group
 # Begin Group "gui"
 
@@ -3005,6 +3653,7 @@ DEP_CPP_ABOUT=\
 	"..\..\common\system.h"\
 	"..\..\gui\about.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	"..\..\gui\widget.h"\
@@ -3168,6 +3817,7 @@ DEP_CPP_BROWS=\
 	"..\..\common\system.h"\
 	"..\..\gui\browser.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\ListWidget.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
@@ -3332,6 +3982,7 @@ DEP_CPP_CHOOS=\
 	"..\..\common\system.h"\
 	"..\..\gui\chooser.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\ListWidget.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
@@ -3482,6 +4133,7 @@ DEP_CPP_CONSO=\
 	"..\..\common\system.h"\
 	"..\..\gui\console.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	"..\..\gui\ScrollBarWidget.h"\
@@ -3625,6 +4277,7 @@ DEP_CPP_DIALO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	"..\..\gui\widget.h"\
@@ -3773,6 +4426,7 @@ DEP_CPP_EDITT=\
 	"..\..\common\system.h"\
 	"..\..\gui\dialog.h"\
 	"..\..\gui\EditTextWidget.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	"..\..\gui\widget.h"\
@@ -4014,12 +4668,14 @@ DEP_CPP_LAUNC=\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
+	"..\..\common\timer.h"\
 	"..\..\common\util.h"\
 	"..\..\gui\about.h"\
 	"..\..\gui\browser.h"\
 	"..\..\gui\chooser.h"\
 	"..\..\gui\dialog.h"\
 	"..\..\gui\EditTextWidget.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\launcher.h"\
 	"..\..\gui\ListWidget.h"\
 	"..\..\gui\message.h"\
@@ -4029,11 +4685,13 @@ DEP_CPP_LAUNC=\
 	"..\..\gui\PopUpWidget.h"\
 	"..\..\gui\TabWidget.h"\
 	"..\..\gui\widget.h"\
+	"..\..\sound\mididrv.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_LAUNC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	"..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -4081,6 +4739,7 @@ NODEP_CPP_LAUNC=\
 	"..\..\gui\base\gameDetector.h"\
 	"..\..\gui\base\plugins.h"\
 	"..\..\gui\common\config-manager.h"\
+	"..\..\gui\common\util.h"\
 	"..\..\gui\gui\about.h"\
 	"..\..\gui\gui\browser.h"\
 	"..\..\gui\gui\chooser.h"\
@@ -4092,6 +4751,7 @@ NODEP_CPP_LAUNC=\
 	"..\..\gui\gui\options.h"\
 	"..\..\gui\gui\PopUpWidget.h"\
 	"..\..\gui\gui\TabWidget.h"\
+	"..\..\gui\sound\mididrv.h"\
 	"..\..\gui\stdafx.h"\
 	
 
@@ -4103,6 +4763,7 @@ NODEP_CPP_LAUNC=\
 	"..\..\gui\base\gameDetector.h"\
 	"..\..\gui\base\plugins.h"\
 	"..\..\gui\common\config-manager.h"\
+	"..\..\gui\common\util.h"\
 	"..\..\gui\gui\about.h"\
 	"..\..\gui\gui\browser.h"\
 	"..\..\gui\gui\chooser.h"\
@@ -4114,6 +4775,7 @@ NODEP_CPP_LAUNC=\
 	"..\..\gui\gui\options.h"\
 	"..\..\gui\gui\PopUpWidget.h"\
 	"..\..\gui\gui\TabWidget.h"\
+	"..\..\gui\sound\mididrv.h"\
 	"..\..\gui\stdafx.h"\
 	
 
@@ -4209,6 +4871,7 @@ DEP_CPP_LISTW=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\ListWidget.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
@@ -4366,6 +5029,7 @@ DEP_CPP_MESSA=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\message.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
@@ -4524,6 +5188,7 @@ DEP_CPP_NEWGU=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
@@ -4531,7 +5196,6 @@ DEP_CPP_NEWGU=\
 NODEP_CPP_NEWGU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\gui\palm.h"\
 	"..\..\gui\scumm_globals.h"\
 	
 
@@ -4747,6 +5411,7 @@ DEP_CPP_OPTIO=\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\savefile.h"\
+	"..\..\common\scaler.h"\
 	"..\..\common\scummsys.h"\
 	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
@@ -4757,6 +5422,7 @@ DEP_CPP_OPTIO=\
 	"..\..\gui\browser.h"\
 	"..\..\gui\chooser.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	"..\..\gui\options.h"\
@@ -4810,6 +5476,7 @@ NODEP_CPP_OPTIO=\
 	"..\..\gui\backends\fs\fs.h"\
 	"..\..\gui\base\gameDetector.h"\
 	"..\..\gui\common\config-manager.h"\
+	"..\..\gui\common\scaler.h"\
 	"..\..\gui\gui\browser.h"\
 	"..\..\gui\gui\chooser.h"\
 	"..\..\gui\gui\newgui.h"\
@@ -4826,6 +5493,7 @@ NODEP_CPP_OPTIO=\
 	"..\..\gui\backends\fs\fs.h"\
 	"..\..\gui\base\gameDetector.h"\
 	"..\..\gui\common\config-manager.h"\
+	"..\..\gui\common\scaler.h"\
 	"..\..\gui\gui\browser.h"\
 	"..\..\gui\gui\chooser.h"\
 	"..\..\gui\gui\newgui.h"\
@@ -4929,6 +5597,7 @@ DEP_CPP_POPUP=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	"..\..\gui\PopUpWidget.h"\
@@ -5081,6 +5750,7 @@ DEP_CPP_SCROL=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	"..\..\gui\ScrollBarWidget.h"\
@@ -5173,11 +5843,11 @@ DEP_CPP_TABWI=\
 	"..\..\gui\object.h"\
 	"..\..\gui\TabWidget.h"\
 	"..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TABWI=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
@@ -5198,11 +5868,11 @@ DEP_CPP_TABWI=\
 	"..\..\gui\object.h"\
 	"..\..\gui\TabWidget.h"\
 	"..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TABWI=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
@@ -5223,11 +5893,11 @@ DEP_CPP_TABWI=\
 	"..\..\gui\object.h"\
 	"..\..\gui\TabWidget.h"\
 	"..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TABWI=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
@@ -5248,11 +5918,11 @@ DEP_CPP_TABWI=\
 	"..\..\gui\object.h"\
 	"..\..\gui\TabWidget.h"\
 	"..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TABWI=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
@@ -5269,6 +5939,7 @@ DEP_CPP_TABWI=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	"..\..\gui\TabWidget.h"\
@@ -5298,11 +5969,11 @@ DEP_CPP_TABWI=\
 	"..\..\gui\object.h"\
 	"..\..\gui\TabWidget.h"\
 	"..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TABWI=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
@@ -5406,6 +6077,7 @@ DEP_CPP_WIDGE=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	"..\..\gui\widget.h"\
@@ -6155,6 +6827,7 @@ DEP_CPP_POCKE=\
 	"..\..\common\system.h"\
 	"..\..\common\timer.h"\
 	"..\..\common\util.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
@@ -6541,6 +7214,7 @@ DEP_CPP_SCREE=\
 	"..\..\common\system.h"\
 	"..\..\common\timer.h"\
 	"..\..\common\util.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
@@ -6923,6 +7597,7 @@ DEP_CPP_SMART=\
 	"..\..\common\system.h"\
 	"..\..\common\timer.h"\
 	"..\..\common\util.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
@@ -7344,6 +8019,7 @@ DEP_CPP_WINCE=\
 	"..\..\common\system.h"\
 	"..\..\common\timer.h"\
 	"..\..\common\util.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\scumm\gfx.h"\
 	"..\..\scumm\script.h"\
@@ -9512,34 +10188,34 @@ DEP_CPP_MAIN_=\
 	"..\..\gui\message.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
-	{$(INCLUDE)}"begin_code.h"\
-	{$(INCLUDE)}"close_code.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL_active.h"\
-	{$(INCLUDE)}"SDL_audio.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL_error.h"\
-	{$(INCLUDE)}"SDL_events.h"\
-	{$(INCLUDE)}"SDL_getenv.h"\
-	{$(INCLUDE)}"SDL_joystick.h"\
-	{$(INCLUDE)}"SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL_keysym.h"\
-	{$(INCLUDE)}"SDL_main.h"\
-	{$(INCLUDE)}"SDL_mouse.h"\
-	{$(INCLUDE)}"SDL_mutex.h"\
-	{$(INCLUDE)}"SDL_quit.h"\
-	{$(INCLUDE)}"SDL_rwops.h"\
-	{$(INCLUDE)}"SDL_timer.h"\
-	{$(INCLUDE)}"SDL_types.h"\
-	{$(INCLUDE)}"SDL_version.h"\
-	{$(INCLUDE)}"SDL_video.h"\
 	
 NODEP_CPP_MAIN_=\
 	"..\..\base\allegro.h"\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\dl.h"\
+	".\DL_active.h"\
+	".\DL_audio.h"\
+	".\DL_byteorder.h"\
+	".\DL_cdrom.h"\
+	".\DL_error.h"\
+	".\DL_events.h"\
+	".\DL_getenv.h"\
+	".\DL_joystick.h"\
+	".\DL_keyboard.h"\
+	".\DL_keysym.h"\
+	".\DL_main.h"\
+	".\DL_mouse.h"\
+	".\DL_mutex.h"\
+	".\DL_quit.h"\
+	".\DL_rwops.h"\
+	".\DL_timer.h"\
+	".\DL_types.h"\
+	".\DL_version.h"\
+	".\DL_video.h"\
+	".\egin_code.h"\
+	".\lose_code.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
@@ -9567,34 +10243,34 @@ DEP_CPP_MAIN_=\
 	"..\..\gui\message.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
-	{$(INCLUDE)}"begin_code.h"\
-	{$(INCLUDE)}"close_code.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL_active.h"\
-	{$(INCLUDE)}"SDL_audio.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL_error.h"\
-	{$(INCLUDE)}"SDL_events.h"\
-	{$(INCLUDE)}"SDL_getenv.h"\
-	{$(INCLUDE)}"SDL_joystick.h"\
-	{$(INCLUDE)}"SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL_keysym.h"\
-	{$(INCLUDE)}"SDL_main.h"\
-	{$(INCLUDE)}"SDL_mouse.h"\
-	{$(INCLUDE)}"SDL_mutex.h"\
-	{$(INCLUDE)}"SDL_quit.h"\
-	{$(INCLUDE)}"SDL_rwops.h"\
-	{$(INCLUDE)}"SDL_timer.h"\
-	{$(INCLUDE)}"SDL_types.h"\
-	{$(INCLUDE)}"SDL_version.h"\
-	{$(INCLUDE)}"SDL_video.h"\
 	
 NODEP_CPP_MAIN_=\
 	"..\..\base\allegro.h"\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\dl.h"\
+	".\DL_active.h"\
+	".\DL_audio.h"\
+	".\DL_byteorder.h"\
+	".\DL_cdrom.h"\
+	".\DL_error.h"\
+	".\DL_events.h"\
+	".\DL_getenv.h"\
+	".\DL_joystick.h"\
+	".\DL_keyboard.h"\
+	".\DL_keysym.h"\
+	".\DL_main.h"\
+	".\DL_mouse.h"\
+	".\DL_mutex.h"\
+	".\DL_quit.h"\
+	".\DL_rwops.h"\
+	".\DL_timer.h"\
+	".\DL_types.h"\
+	".\DL_version.h"\
+	".\DL_video.h"\
+	".\egin_code.h"\
+	".\lose_code.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
@@ -9622,34 +10298,34 @@ DEP_CPP_MAIN_=\
 	"..\..\gui\message.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
-	{$(INCLUDE)}"begin_code.h"\
-	{$(INCLUDE)}"close_code.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL_active.h"\
-	{$(INCLUDE)}"SDL_audio.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL_error.h"\
-	{$(INCLUDE)}"SDL_events.h"\
-	{$(INCLUDE)}"SDL_getenv.h"\
-	{$(INCLUDE)}"SDL_joystick.h"\
-	{$(INCLUDE)}"SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL_keysym.h"\
-	{$(INCLUDE)}"SDL_main.h"\
-	{$(INCLUDE)}"SDL_mouse.h"\
-	{$(INCLUDE)}"SDL_mutex.h"\
-	{$(INCLUDE)}"SDL_quit.h"\
-	{$(INCLUDE)}"SDL_rwops.h"\
-	{$(INCLUDE)}"SDL_timer.h"\
-	{$(INCLUDE)}"SDL_types.h"\
-	{$(INCLUDE)}"SDL_version.h"\
-	{$(INCLUDE)}"SDL_video.h"\
 	
 NODEP_CPP_MAIN_=\
 	"..\..\base\allegro.h"\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\dl.h"\
+	".\DL_active.h"\
+	".\DL_audio.h"\
+	".\DL_byteorder.h"\
+	".\DL_cdrom.h"\
+	".\DL_error.h"\
+	".\DL_events.h"\
+	".\DL_getenv.h"\
+	".\DL_joystick.h"\
+	".\DL_keyboard.h"\
+	".\DL_keysym.h"\
+	".\DL_main.h"\
+	".\DL_mouse.h"\
+	".\DL_mutex.h"\
+	".\DL_quit.h"\
+	".\DL_rwops.h"\
+	".\DL_timer.h"\
+	".\DL_types.h"\
+	".\DL_version.h"\
+	".\DL_video.h"\
+	".\egin_code.h"\
+	".\lose_code.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
@@ -9677,34 +10353,34 @@ DEP_CPP_MAIN_=\
 	"..\..\gui\message.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
-	{$(INCLUDE)}"begin_code.h"\
-	{$(INCLUDE)}"close_code.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL_active.h"\
-	{$(INCLUDE)}"SDL_audio.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL_error.h"\
-	{$(INCLUDE)}"SDL_events.h"\
-	{$(INCLUDE)}"SDL_getenv.h"\
-	{$(INCLUDE)}"SDL_joystick.h"\
-	{$(INCLUDE)}"SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL_keysym.h"\
-	{$(INCLUDE)}"SDL_main.h"\
-	{$(INCLUDE)}"SDL_mouse.h"\
-	{$(INCLUDE)}"SDL_mutex.h"\
-	{$(INCLUDE)}"SDL_quit.h"\
-	{$(INCLUDE)}"SDL_rwops.h"\
-	{$(INCLUDE)}"SDL_timer.h"\
-	{$(INCLUDE)}"SDL_types.h"\
-	{$(INCLUDE)}"SDL_version.h"\
-	{$(INCLUDE)}"SDL_video.h"\
 	
 NODEP_CPP_MAIN_=\
 	"..\..\base\allegro.h"\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\dl.h"\
+	".\DL_active.h"\
+	".\DL_audio.h"\
+	".\DL_byteorder.h"\
+	".\DL_cdrom.h"\
+	".\DL_error.h"\
+	".\DL_events.h"\
+	".\DL_getenv.h"\
+	".\DL_joystick.h"\
+	".\DL_keyboard.h"\
+	".\DL_keysym.h"\
+	".\DL_main.h"\
+	".\DL_mouse.h"\
+	".\DL_mutex.h"\
+	".\DL_quit.h"\
+	".\DL_rwops.h"\
+	".\DL_timer.h"\
+	".\DL_types.h"\
+	".\DL_version.h"\
+	".\DL_video.h"\
+	".\egin_code.h"\
+	".\lose_code.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
@@ -9728,6 +10404,7 @@ DEP_CPP_MAIN_=\
 	"..\..\common\timer.h"\
 	"..\..\common\util.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\launcher.h"\
 	"..\..\gui\message.h"\
 	"..\..\gui\newgui.h"\
diff --git a/dists/msevc3/simon.vcp b/dists/msevc3/simon.vcp
index bf3d4510b7..8923510b0b 100644
--- a/dists/msevc3/simon.vcp
+++ b/dists/msevc3/simon.vcp
@@ -52,15 +52,15 @@ CFG=simon - Win32 (WCE MIPS) Debug
 # PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "WIN32" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "DISABLE_QUEEN" /YX /Oxs /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clmips.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "WIN32" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "DISABLE_QUEEN" /YX /Oxs /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
@@ -78,15 +78,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D "NONSTANDARD_PORT" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "DISABLE_QUEEN" /YX /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clmips.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D "NONSTANDARD_PORT" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "DISABLE_QUEEN" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
@@ -105,8 +105,8 @@ BSC32=bscmake.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "WIN32" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /YX /Oxs /M$(CECrtMT) /c
+# ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /Oxs /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "WIN32" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /YX /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -156,15 +156,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /W3 /GX /O2 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D "WIN32" /D "USE_VORBIS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /FR /YX /Oxs /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /W3 /GX  /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D "WIN32" /D "USE_VORBIS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /FR /YX /Oxs /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
 
@@ -182,15 +182,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "NDEBUG" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /YX /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "NDEBUG" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
 
@@ -208,15 +208,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Oxs /Gz /c
-# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Oxs /Gz /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Oxs /Gz /c
+# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Oxs /Gz /c
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Debug"
 
@@ -234,15 +234,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6518FF4-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gz /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gz /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gz /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gz /c
 
 !ENDIF 
 
@@ -283,17 +283,17 @@ DEP_CPP_CHARS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -316,17 +316,17 @@ DEP_CPP_CHARS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
@@ -349,17 +349,17 @@ DEP_CPP_CHARS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -382,17 +382,17 @@ DEP_CPP_CHARS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
@@ -415,17 +415,17 @@ DEP_CPP_CHARS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
@@ -447,19 +447,19 @@ DEP_CPP_CHARS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\simon\stdafx.h"\
 	"..\..\sound\stdafx.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -507,17 +507,17 @@ DEP_CPP_DEBUG=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -542,17 +542,17 @@ DEP_CPP_DEBUG=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
@@ -577,17 +577,17 @@ DEP_CPP_DEBUG=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -612,17 +612,17 @@ DEP_CPP_DEBUG=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
@@ -647,17 +647,17 @@ DEP_CPP_DEBUG=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
@@ -681,19 +681,19 @@ DEP_CPP_DEBUG=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\simon\stdafx.h"\
 	"..\..\sound\stdafx.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -751,17 +751,17 @@ DEP_CPP_ITEMS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ITEMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -784,17 +784,17 @@ DEP_CPP_ITEMS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ITEMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
@@ -817,17 +817,17 @@ DEP_CPP_ITEMS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ITEMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -850,17 +850,17 @@ DEP_CPP_ITEMS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ITEMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
@@ -883,17 +883,17 @@ DEP_CPP_ITEMS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ITEMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
@@ -915,19 +915,19 @@ DEP_CPP_ITEMS=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ITEMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\simon\stdafx.h"\
 	"..\..\sound\stdafx.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -974,17 +974,17 @@ DEP_CPP_MIDI_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MIDI_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -1008,17 +1008,17 @@ DEP_CPP_MIDI_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MIDI_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
@@ -1042,17 +1042,17 @@ DEP_CPP_MIDI_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MIDI_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -1076,17 +1076,17 @@ DEP_CPP_MIDI_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MIDI_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
@@ -1110,17 +1110,17 @@ DEP_CPP_MIDI_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MIDI_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
@@ -1143,19 +1143,19 @@ DEP_CPP_MIDI_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MIDI_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\simon\stdafx.h"\
 	"..\..\sound\stdafx.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -1203,11 +1203,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -1222,11 +1222,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
@@ -1241,11 +1241,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -1260,11 +1260,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
@@ -1279,11 +1279,11 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
@@ -1297,12 +1297,12 @@ DEP_CPP_MIDIP=\
 	"..\..\common\util.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\simon\stdafx.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -1351,17 +1351,17 @@ DEP_CPP_RES_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RES_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -1385,17 +1385,17 @@ DEP_CPP_RES_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RES_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
@@ -1419,17 +1419,17 @@ DEP_CPP_RES_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RES_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -1453,17 +1453,17 @@ DEP_CPP_RES_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RES_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
@@ -1487,17 +1487,17 @@ DEP_CPP_RES_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RES_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
@@ -1520,19 +1520,19 @@ DEP_CPP_RES_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RES_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\simon\stdafx.h"\
 	"..\..\sound\stdafx.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -1587,17 +1587,17 @@ DEP_CPP_SIMON=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SIMON=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -1627,17 +1627,17 @@ DEP_CPP_SIMON=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SIMON=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
@@ -1667,17 +1667,17 @@ DEP_CPP_SIMON=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SIMON=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -1707,17 +1707,17 @@ DEP_CPP_SIMON=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SIMON=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
@@ -1747,17 +1747,17 @@ DEP_CPP_SIMON=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SIMON=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
@@ -1786,19 +1786,19 @@ DEP_CPP_SIMON=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SIMON=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\simon\stdafx.h"\
 	"..\..\sound\stdafx.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -1857,17 +1857,17 @@ DEP_CPP_SOUND=\
 	"..\..\simon\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -1887,17 +1887,17 @@ DEP_CPP_SOUND=\
 	"..\..\simon\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
@@ -1917,17 +1917,17 @@ DEP_CPP_SOUND=\
 	"..\..\simon\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -1947,17 +1947,17 @@ DEP_CPP_SOUND=\
 	"..\..\simon\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
@@ -1977,17 +1977,17 @@ DEP_CPP_SOUND=\
 	"..\..\simon\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
@@ -2006,19 +2006,19 @@ DEP_CPP_SOUND=\
 	"..\..\simon\sound.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\voc.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\simon\stdafx.h"\
 	"..\..\sound\stdafx.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -2072,17 +2072,17 @@ DEP_CPP_VERB_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VERB_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -2105,17 +2105,17 @@ DEP_CPP_VERB_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VERB_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
@@ -2138,17 +2138,17 @@ DEP_CPP_VERB_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VERB_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -2171,17 +2171,17 @@ DEP_CPP_VERB_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VERB_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
@@ -2204,17 +2204,17 @@ DEP_CPP_VERB_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VERB_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
@@ -2236,19 +2236,19 @@ DEP_CPP_VERB_=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VERB_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\simon\stdafx.h"\
 	"..\..\sound\stdafx.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -2295,17 +2295,17 @@ DEP_CPP_VGA_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -2329,17 +2329,17 @@ DEP_CPP_VGA_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
@@ -2363,17 +2363,17 @@ DEP_CPP_VGA_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -2397,17 +2397,17 @@ DEP_CPP_VGA_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
@@ -2431,17 +2431,17 @@ DEP_CPP_VGA_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
@@ -2464,19 +2464,19 @@ DEP_CPP_VGA_C=\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\midiparser.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\simon\stdafx.h"\
 	"..\..\sound\stdafx.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
diff --git a/dists/msevc3/sky.vcp b/dists/msevc3/sky.vcp
index f7ff4814ce..0378e484b1 100644
--- a/dists/msevc3/sky.vcp
+++ b/dists/msevc3/sky.vcp
@@ -49,15 +49,15 @@ CFG=sky - Win32 (WCE MIPS) Debug
 # PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "DISABLE_QUEEN" /YX /Oxs /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clmips.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "DISABLE_QUEEN" /YX /Oxs /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
@@ -75,15 +75,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6519010-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "DISABLE_QUEEN" /YX /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clmips.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "DISABLE_QUEEN" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
 
@@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /YX /Oxs /M$(CECrtMT) /c
+# ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /Oxs /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /YX /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -153,15 +153,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D "USE_VORBIS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /YX /Oxs /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /GX  /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "_LIB" /D "USE_VORBIS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /YX /Oxs /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
 
@@ -179,15 +179,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /YX /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../" /I "../../common/" /I "../../backends/wince/" /I "../../backends/wince/missing/" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /YX /M$(CECrtMTDebug) /c
 
 !ENDIF 
 
@@ -526,11 +526,11 @@ DEP_CPP_SAVED=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVED=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -550,11 +550,11 @@ DEP_CPP_SAVED=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVED=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -574,11 +574,11 @@ DEP_CPP_SAVED=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVED=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -598,11 +598,11 @@ DEP_CPP_SAVED=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVED=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -622,11 +622,11 @@ DEP_CPP_SAVED=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVED=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -646,11 +646,11 @@ DEP_CPP_SAVED=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVED=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -685,11 +685,11 @@ DEP_CPP_ADLIB=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ADLIB=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -709,11 +709,11 @@ DEP_CPP_ADLIB=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ADLIB=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -733,11 +733,11 @@ DEP_CPP_ADLIB=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ADLIB=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -757,11 +757,11 @@ DEP_CPP_ADLIB=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ADLIB=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -781,11 +781,11 @@ DEP_CPP_ADLIB=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ADLIB=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -805,11 +805,11 @@ DEP_CPP_ADLIB=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ADLIB=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -841,17 +841,17 @@ DEP_CPP_ADLIBM=\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ADLIBM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -872,17 +872,17 @@ DEP_CPP_ADLIBM=\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ADLIBM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -903,17 +903,17 @@ DEP_CPP_ADLIBM=\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ADLIBM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -934,17 +934,17 @@ DEP_CPP_ADLIBM=\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ADLIBM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -965,17 +965,17 @@ DEP_CPP_ADLIBM=\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ADLIBM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -996,17 +996,17 @@ DEP_CPP_ADLIBM=\
 	"..\..\sky\sky.h"\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ADLIBM=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -1033,11 +1033,11 @@ DEP_CPP_GMCHA=\
 	"..\..\sky\music\gmchannel.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMCHA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -1053,11 +1053,11 @@ DEP_CPP_GMCHA=\
 	"..\..\sky\music\gmchannel.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMCHA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -1073,11 +1073,11 @@ DEP_CPP_GMCHA=\
 	"..\..\sky\music\gmchannel.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMCHA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -1093,11 +1093,11 @@ DEP_CPP_GMCHA=\
 	"..\..\sky\music\gmchannel.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMCHA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -1113,11 +1113,11 @@ DEP_CPP_GMCHA=\
 	"..\..\sky\music\gmchannel.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMCHA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -1133,11 +1133,11 @@ DEP_CPP_GMCHA=\
 	"..\..\sky\music\gmchannel.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMCHA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -1169,11 +1169,11 @@ DEP_CPP_GMMUS=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMMUS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -1194,11 +1194,11 @@ DEP_CPP_GMMUS=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMMUS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -1219,11 +1219,11 @@ DEP_CPP_GMMUS=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMMUS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -1244,11 +1244,11 @@ DEP_CPP_GMMUS=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMMUS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -1269,11 +1269,11 @@ DEP_CPP_GMMUS=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMMUS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -1294,11 +1294,11 @@ DEP_CPP_GMMUS=\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMMUS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -1326,11 +1326,11 @@ DEP_CPP_MT32M=\
 	"..\..\sky\music\mt32music.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MT32M=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -1347,11 +1347,11 @@ DEP_CPP_MT32M=\
 	"..\..\sky\music\mt32music.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MT32M=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -1368,11 +1368,11 @@ DEP_CPP_MT32M=\
 	"..\..\sky\music\mt32music.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MT32M=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -1389,11 +1389,11 @@ DEP_CPP_MT32M=\
 	"..\..\sky\music\mt32music.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MT32M=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -1410,11 +1410,11 @@ DEP_CPP_MT32M=\
 	"..\..\sky\music\mt32music.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MT32M=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -1431,11 +1431,11 @@ DEP_CPP_MT32M=\
 	"..\..\sky\music\mt32music.h"\
 	"..\..\sky\music\musicbase.h"\
 	"..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MT32M=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -1463,11 +1463,11 @@ DEP_CPP_MUSIC=\
 	"..\..\common\util.h"\
 	"..\..\sky\disk.h"\
 	"..\..\sky\music\musicbase.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -1484,11 +1484,11 @@ DEP_CPP_MUSIC=\
 	"..\..\common\util.h"\
 	"..\..\sky\disk.h"\
 	"..\..\sky\music\musicbase.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -1505,11 +1505,11 @@ DEP_CPP_MUSIC=\
 	"..\..\common\util.h"\
 	"..\..\sky\disk.h"\
 	"..\..\sky\music\musicbase.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -1526,11 +1526,11 @@ DEP_CPP_MUSIC=\
 	"..\..\common\util.h"\
 	"..\..\sky\disk.h"\
 	"..\..\sky\music\musicbase.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -1547,11 +1547,11 @@ DEP_CPP_MUSIC=\
 	"..\..\common\util.h"\
 	"..\..\sky\disk.h"\
 	"..\..\sky\music\musicbase.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -1568,11 +1568,11 @@ DEP_CPP_MUSIC=\
 	"..\..\common\util.h"\
 	"..\..\sky\disk.h"\
 	"..\..\sky\music\musicbase.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -1606,11 +1606,11 @@ DEP_CPP_AUTOR=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AUTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -1632,11 +1632,11 @@ DEP_CPP_AUTOR=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AUTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -1658,11 +1658,11 @@ DEP_CPP_AUTOR=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AUTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -1684,11 +1684,11 @@ DEP_CPP_AUTOR=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AUTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -1710,11 +1710,11 @@ DEP_CPP_AUTOR=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AUTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -1736,11 +1736,11 @@ DEP_CPP_AUTOR=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AUTOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -1847,11 +1847,11 @@ DEP_CPP_COMPA=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COMPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -1947,11 +1947,11 @@ DEP_CPP_COMPA=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COMPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -2047,11 +2047,11 @@ DEP_CPP_COMPA=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COMPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -2147,11 +2147,11 @@ DEP_CPP_COMPA=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COMPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -2247,11 +2247,11 @@ DEP_CPP_COMPA=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COMPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -2347,11 +2347,11 @@ DEP_CPP_COMPA=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COMPA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -2392,17 +2392,17 @@ DEP_CPP_CONTR=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -2432,17 +2432,17 @@ DEP_CPP_CONTR=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -2472,17 +2472,17 @@ DEP_CPP_CONTR=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -2512,17 +2512,17 @@ DEP_CPP_CONTR=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -2552,17 +2552,17 @@ DEP_CPP_CONTR=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -2592,17 +2592,17 @@ DEP_CPP_CONTR=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -2627,11 +2627,11 @@ DEP_CPP_DEBUG=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\sky\debug.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -2645,11 +2645,11 @@ DEP_CPP_DEBUG=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\sky\debug.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -2663,11 +2663,11 @@ DEP_CPP_DEBUG=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\sky\debug.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -2681,11 +2681,11 @@ DEP_CPP_DEBUG=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\sky\debug.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -2699,11 +2699,11 @@ DEP_CPP_DEBUG=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\sky\debug.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -2717,11 +2717,11 @@ DEP_CPP_DEBUG=\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
 	"..\..\sky\debug.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -2753,11 +2753,11 @@ DEP_CPP_DISK_=\
 	"..\..\sky\rnc_deco.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DISK_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -2778,11 +2778,11 @@ DEP_CPP_DISK_=\
 	"..\..\sky\rnc_deco.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DISK_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -2803,11 +2803,11 @@ DEP_CPP_DISK_=\
 	"..\..\sky\rnc_deco.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DISK_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -2828,11 +2828,11 @@ DEP_CPP_DISK_=\
 	"..\..\sky\rnc_deco.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DISK_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -2853,11 +2853,11 @@ DEP_CPP_DISK_=\
 	"..\..\sky\rnc_deco.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DISK_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -2878,11 +2878,11 @@ DEP_CPP_DISK_=\
 	"..\..\sky\rnc_deco.h"\
 	"..\..\sky\sky.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DISK_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -2916,11 +2916,11 @@ DEP_CPP_GRID_=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GRID_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -2943,11 +2943,11 @@ DEP_CPP_GRID_=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GRID_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -2970,11 +2970,11 @@ DEP_CPP_GRID_=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GRID_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -2997,11 +2997,11 @@ DEP_CPP_GRID_=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GRID_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -3024,11 +3024,11 @@ DEP_CPP_GRID_=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GRID_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -3051,11 +3051,11 @@ DEP_CPP_GRID_=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GRID_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -3077,11 +3077,11 @@ DEP_CPP_HUFFT=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HUFFT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -3092,11 +3092,11 @@ DEP_CPP_HUFFT=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HUFFT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3107,11 +3107,11 @@ DEP_CPP_HUFFT=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HUFFT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -3122,11 +3122,11 @@ DEP_CPP_HUFFT=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HUFFT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -3137,11 +3137,11 @@ DEP_CPP_HUFFT=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HUFFT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -3152,11 +3152,11 @@ DEP_CPP_HUFFT=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HUFFT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -3189,17 +3189,17 @@ DEP_CPP_INTRO=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_INTRO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -3225,17 +3225,17 @@ DEP_CPP_INTRO=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_INTRO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3261,17 +3261,17 @@ DEP_CPP_INTRO=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_INTRO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -3297,17 +3297,17 @@ DEP_CPP_INTRO=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_INTRO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -3333,17 +3333,17 @@ DEP_CPP_INTRO=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_INTRO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -3369,17 +3369,17 @@ DEP_CPP_INTRO=\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_INTRO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -3424,17 +3424,17 @@ DEP_CPP_LOGIC=\
 	"..\..\sky\talks.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -3468,17 +3468,17 @@ DEP_CPP_LOGIC=\
 	"..\..\sky\talks.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3512,17 +3512,17 @@ DEP_CPP_LOGIC=\
 	"..\..\sky\talks.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -3556,17 +3556,17 @@ DEP_CPP_LOGIC=\
 	"..\..\sky\talks.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -3600,17 +3600,17 @@ DEP_CPP_LOGIC=\
 	"..\..\sky\talks.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -3644,17 +3644,17 @@ DEP_CPP_LOGIC=\
 	"..\..\sky\talks.h"\
 	"..\..\sky\text.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -3687,11 +3687,11 @@ DEP_CPP_MOUSE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -3713,11 +3713,11 @@ DEP_CPP_MOUSE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3739,11 +3739,11 @@ DEP_CPP_MOUSE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -3765,11 +3765,11 @@ DEP_CPP_MOUSE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -3791,11 +3791,11 @@ DEP_CPP_MOUSE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -3817,11 +3817,11 @@ DEP_CPP_MOUSE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -3843,11 +3843,11 @@ DEP_CPP_RNC_D=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\rnc_deco.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RNC_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -3858,11 +3858,11 @@ DEP_CPP_RNC_D=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\rnc_deco.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RNC_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3873,11 +3873,11 @@ DEP_CPP_RNC_D=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\rnc_deco.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RNC_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -3888,11 +3888,11 @@ DEP_CPP_RNC_D=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\rnc_deco.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RNC_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -3903,11 +3903,11 @@ DEP_CPP_RNC_D=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\rnc_deco.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RNC_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -3918,11 +3918,11 @@ DEP_CPP_RNC_D=\
 	"..\..\common\scummsys.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\sky\rnc_deco.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RNC_D=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -3955,11 +3955,11 @@ DEP_CPP_SCREE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCREE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -3981,11 +3981,11 @@ DEP_CPP_SCREE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCREE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -4007,11 +4007,11 @@ DEP_CPP_SCREE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCREE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -4033,11 +4033,11 @@ DEP_CPP_SCREE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCREE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -4059,11 +4059,11 @@ DEP_CPP_SCREE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCREE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -4085,11 +4085,11 @@ DEP_CPP_SCREE=\
 	"..\..\sky\sky.h"\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCREE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -4143,18 +4143,18 @@ DEP_CPP_SKY_C=\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SKY_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -4197,18 +4197,18 @@ DEP_CPP_SKY_C=\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SKY_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -4251,18 +4251,18 @@ DEP_CPP_SKY_C=\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SKY_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -4305,18 +4305,18 @@ DEP_CPP_SKY_C=\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SKY_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -4359,18 +4359,18 @@ DEP_CPP_SKY_C=\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SKY_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -4413,18 +4413,18 @@ DEP_CPP_SKY_C=\
 	"..\..\sound\fmopl.h"\
 	"..\..\sound\mididrv.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SKY_C=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	"..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -4462,17 +4462,17 @@ DEP_CPP_SOUND=\
 	"..\..\sky\sound.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -4495,17 +4495,17 @@ DEP_CPP_SOUND=\
 	"..\..\sky\sound.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -4528,17 +4528,17 @@ DEP_CPP_SOUND=\
 	"..\..\sky\sound.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -4561,17 +4561,17 @@ DEP_CPP_SOUND=\
 	"..\..\sky\sound.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -4594,17 +4594,17 @@ DEP_CPP_SOUND=\
 	"..\..\sky\sound.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -4627,17 +4627,17 @@ DEP_CPP_SOUND=\
 	"..\..\sky\sound.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -4678,11 +4678,11 @@ DEP_CPP_TEXT_=\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
@@ -4704,11 +4704,11 @@ DEP_CPP_TEXT_=\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -4730,11 +4730,11 @@ DEP_CPP_TEXT_=\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
@@ -4756,11 +4756,11 @@ DEP_CPP_TEXT_=\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
@@ -4782,11 +4782,11 @@ DEP_CPP_TEXT_=\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
@@ -4808,11 +4808,11 @@ DEP_CPP_TEXT_=\
 	"..\..\sky\skydefs.h"\
 	"..\..\sky\struc.h"\
 	"..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
diff --git a/dists/msevc3/sword2.vcp b/dists/msevc3/sword2.vcp
index ac8b170dd4..4186a0f7ac 100644
--- a/dists/msevc3/sword2.vcp
+++ b/dists/msevc3/sword2.vcp
@@ -215,9 +215,8 @@ DEP_CPP__MOUS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -228,11 +227,27 @@ DEP_CPP__MOUS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP__MOUS=\
@@ -253,9 +268,8 @@ DEP_CPP__MOUS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -266,11 +280,27 @@ DEP_CPP__MOUS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP__MOUS=\
@@ -291,9 +321,8 @@ DEP_CPP__MOUS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -304,11 +333,27 @@ DEP_CPP__MOUS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP__MOUS=\
@@ -329,9 +374,8 @@ DEP_CPP__MOUS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -342,11 +386,27 @@ DEP_CPP__MOUS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP__MOUS=\
@@ -368,9 +428,7 @@ DEP_CPP__MOUS=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -383,43 +441,47 @@ DEP_CPP__MOUS=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP__MOUS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP__MOUS=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -430,18 +492,32 @@ DEP_CPP__MOUS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP__MOUS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\driver\stdafx.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -456,10 +532,6 @@ NODEP_CPP__MOUS=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\driver\_mouse.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\driver\d_draw.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
@@ -468,9 +540,8 @@ DEP_CPP_D_DRA=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -481,24 +552,34 @@ DEP_CPP_D_DRA=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_D_DRA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -514,9 +595,8 @@ DEP_CPP_D_DRA=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -527,24 +607,34 @@ DEP_CPP_D_DRA=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_D_DRA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -560,9 +650,8 @@ DEP_CPP_D_DRA=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -573,24 +662,34 @@ DEP_CPP_D_DRA=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_D_DRA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -606,9 +705,8 @@ DEP_CPP_D_DRA=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -619,24 +717,34 @@ DEP_CPP_D_DRA=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_D_DRA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -653,9 +761,7 @@ DEP_CPP_D_DRA=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -668,46 +774,49 @@ DEP_CPP_D_DRA=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_D_DRA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_D_DRA=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -718,26 +827,34 @@ DEP_CPP_D_DRA=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_D_DRA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\driver\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -764,9 +881,9 @@ DEP_CPP_D_SOU=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -777,8 +894,27 @@ DEP_CPP_D_SOU=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_D_SOU=\
@@ -799,9 +935,9 @@ DEP_CPP_D_SOU=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -812,8 +948,27 @@ DEP_CPP_D_SOU=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_D_SOU=\
@@ -834,9 +989,9 @@ DEP_CPP_D_SOU=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -847,8 +1002,27 @@ DEP_CPP_D_SOU=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_D_SOU=\
@@ -869,9 +1043,9 @@ DEP_CPP_D_SOU=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -882,8 +1056,27 @@ DEP_CPP_D_SOU=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_D_SOU=\
@@ -907,7 +1100,6 @@ DEP_CPP_D_SOU=\
 	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -920,41 +1112,48 @@ DEP_CPP_D_SOU=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_D_SOU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_D_SOU=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -965,15 +1164,32 @@ DEP_CPP_D_SOU=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_D_SOU=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\driver\stdafx.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -1004,6 +1220,7 @@ DEP_CPP_KEYBO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -1012,12 +1229,42 @@ DEP_CPP_KEYBO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_KEYBO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -1026,6 +1273,7 @@ DEP_CPP_KEYBO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -1034,12 +1282,42 @@ DEP_CPP_KEYBO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_KEYBO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -1048,6 +1326,7 @@ DEP_CPP_KEYBO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -1056,12 +1335,42 @@ DEP_CPP_KEYBO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_KEYBO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -1070,6 +1379,7 @@ DEP_CPP_KEYBO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -1078,12 +1388,42 @@ DEP_CPP_KEYBO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_KEYBO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -1092,6 +1432,7 @@ DEP_CPP_KEYBO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -1100,53 +1441,51 @@ DEP_CPP_KEYBO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_KEYBO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_KEYBO=\
 	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\driver96.h"\
-	
-NODEP_CPP_KEYBO=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	"..\..\sword2\driver\stdafx.h"\
-	".\DL_byteorder.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sword2\driver\keyboard.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sword2\driver\language.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-DEP_CPP_LANGU=\
-	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -1155,122 +1494,42 @@ DEP_CPP_LANGU=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
-NODEP_CPP_LANGU=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_LANGU=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\driver96.h"\
-	
-NODEP_CPP_LANGU=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
-
-DEP_CPP_LANGU=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\driver96.h"\
-	
-NODEP_CPP_LANGU=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_LANGU=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\driver96.h"\
-	
-NODEP_CPP_LANGU=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_LANGU=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\driver96.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_LANGU=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_LANGU=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\driver96.h"\
-	
-NODEP_CPP_LANGU=\
+NODEP_CPP_KEYBO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\driver\stdafx.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -1286,6 +1545,7 @@ DEP_CPP_MENU_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -1294,177 +1554,35 @@ DEP_CPP_MENU_=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
-	"..\..\sword2\driver\d_draw.h"\
-	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
-	
-NODEP_CPP_MENU_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_MENU_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\d_draw.h"\
-	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
-	
-NODEP_CPP_MENU_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
-
-DEP_CPP_MENU_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\d_draw.h"\
-	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
-	
-NODEP_CPP_MENU_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_MENU_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\d_draw.h"\
-	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
-	
-NODEP_CPP_MENU_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_MENU_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\d_draw.h"\
-	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_MENU_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_MENU_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\list.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\driver\d_draw.h"\
-	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\render.h"\
-	
-NODEP_CPP_MENU_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	"..\..\sword2\driver\stdafx.h"\
-	".\DL_byteorder.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sword2\driver\menu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sword2\driver\misc.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-DEP_CPP_MISC_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
-	"..\..\common\list.h"\
-	"..\..\common\map.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\driver\menu.h"\
+	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MISC_=\
+NODEP_CPP_MENU_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	".\ad.h"\
@@ -1478,13 +1596,12 @@ NODEP_CPP_MISC_=\
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MISC_=\
+DEP_CPP_MENU_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1495,11 +1612,32 @@ DEP_CPP_MISC_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\driver\menu.h"\
+	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MISC_=\
+NODEP_CPP_MENU_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	".\ad.h"\
@@ -1513,13 +1651,12 @@ NODEP_CPP_MISC_=\
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_MISC_=\
+DEP_CPP_MENU_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1530,11 +1667,32 @@ DEP_CPP_MISC_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\driver\menu.h"\
+	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MISC_=\
+NODEP_CPP_MENU_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	".\ad.h"\
@@ -1548,13 +1706,12 @@ NODEP_CPP_MISC_=\
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MISC_=\
+DEP_CPP_MENU_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1565,11 +1722,32 @@ DEP_CPP_MISC_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\driver\menu.h"\
+	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MISC_=\
+NODEP_CPP_MENU_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
 	".\ad.h"\
@@ -1583,14 +1761,12 @@ NODEP_CPP_MISC_=\
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_MISC_=\
+DEP_CPP_MENU_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1603,41 +1779,49 @@ DEP_CPP_MISC_=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
+	"..\..\sword2\driver\menu.h"\
+	"..\..\sword2\driver\render.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
-NODEP_CPP_MISC_=\
+NODEP_CPP_MENU_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MISC_=\
+DEP_CPP_MENU_=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1648,15 +1832,34 @@ DEP_CPP_MISC_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\driver\menu.h"\
+	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MISC_=\
+NODEP_CPP_MENU_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\driver\stdafx.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -1671,6 +1874,10 @@ NODEP_CPP_MISC_=\
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\sword2\driver\menu.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\sword2\driver\palette.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
@@ -1679,9 +1886,8 @@ DEP_CPP_PALET=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1692,9 +1898,27 @@ DEP_CPP_PALET=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_PALET=\
@@ -1715,9 +1939,8 @@ DEP_CPP_PALET=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1728,9 +1951,27 @@ DEP_CPP_PALET=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_PALET=\
@@ -1751,9 +1992,8 @@ DEP_CPP_PALET=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1764,9 +2004,27 @@ DEP_CPP_PALET=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_PALET=\
@@ -1787,9 +2045,8 @@ DEP_CPP_PALET=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1800,9 +2057,27 @@ DEP_CPP_PALET=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_PALET=\
@@ -1824,9 +2099,7 @@ DEP_CPP_PALET=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1839,41 +2112,47 @@ DEP_CPP_PALET=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PALET=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_PALET=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1884,16 +2163,32 @@ DEP_CPP_PALET=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_PALET=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\driver\stdafx.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -1908,10 +2203,6 @@ NODEP_CPP_PALET=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\driver\palette.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\driver\rdwin.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
@@ -1920,9 +2211,8 @@ DEP_CPP_RDWIN=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1933,15 +2223,28 @@ DEP_CPP_RDWIN=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\driver\_mouse.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\keyboard.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RDWIN=\
@@ -1962,9 +2265,8 @@ DEP_CPP_RDWIN=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -1975,15 +2277,28 @@ DEP_CPP_RDWIN=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\driver\_mouse.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\keyboard.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RDWIN=\
@@ -2004,9 +2319,8 @@ DEP_CPP_RDWIN=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2017,15 +2331,28 @@ DEP_CPP_RDWIN=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\driver\_mouse.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\keyboard.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RDWIN=\
@@ -2046,9 +2373,8 @@ DEP_CPP_RDWIN=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2059,15 +2385,28 @@ DEP_CPP_RDWIN=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\driver\_mouse.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\keyboard.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RDWIN=\
@@ -2089,9 +2428,7 @@ DEP_CPP_RDWIN=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2104,47 +2441,48 @@ DEP_CPP_RDWIN=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
-	"..\..\sword2\driver\_mouse.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\keyboard.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RDWIN=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_RDWIN=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2155,21 +2493,33 @@ DEP_CPP_RDWIN=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\driver\_mouse.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\keyboard.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RDWIN=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -2184,10 +2534,6 @@ NODEP_CPP_RDWIN=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\driver\rdwin.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\driver\render.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
@@ -2196,9 +2542,8 @@ DEP_CPP_RENDE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2209,13 +2554,29 @@ DEP_CPP_RENDE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\driver\_mouse.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RENDE=\
@@ -2236,9 +2597,8 @@ DEP_CPP_RENDE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2249,13 +2609,29 @@ DEP_CPP_RENDE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\driver\_mouse.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RENDE=\
@@ -2276,9 +2652,8 @@ DEP_CPP_RENDE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2289,13 +2664,29 @@ DEP_CPP_RENDE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\driver\_mouse.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RENDE=\
@@ -2316,9 +2707,8 @@ DEP_CPP_RENDE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2329,13 +2719,29 @@ DEP_CPP_RENDE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\driver\_mouse.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RENDE=\
@@ -2357,9 +2763,7 @@ DEP_CPP_RENDE=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2372,45 +2776,49 @@ DEP_CPP_RENDE=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
-	"..\..\sword2\driver\_mouse.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RENDE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_RENDE=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2421,20 +2829,34 @@ DEP_CPP_RENDE=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\driver\_mouse.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\rdwin.h"\
 	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RENDE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\driver\stdafx.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -2461,6 +2883,7 @@ DEP_CPP_SPRIT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -2469,17 +2892,42 @@ DEP_CPP_SPRIT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SPRIT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -2488,6 +2936,7 @@ DEP_CPP_SPRIT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -2496,17 +2945,42 @@ DEP_CPP_SPRIT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SPRIT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -2515,6 +2989,7 @@ DEP_CPP_SPRIT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -2523,17 +2998,42 @@ DEP_CPP_SPRIT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SPRIT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -2542,6 +3042,7 @@ DEP_CPP_SPRIT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -2550,17 +3051,42 @@ DEP_CPP_SPRIT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SPRIT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -2569,6 +3095,7 @@ DEP_CPP_SPRIT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -2577,24 +3104,51 @@ DEP_CPP_SPRIT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SPRIT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SPRIT=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -2603,18 +3157,42 @@ DEP_CPP_SPRIT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\menu.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\driver\render.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
+	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SPRIT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\driver\stdafx.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -2631,9 +3209,9 @@ DEP_CPP_ANIMS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2644,7 +3222,7 @@ DEP_CPP_ANIMS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
@@ -2653,20 +3231,25 @@ DEP_CPP_ANIMS=\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
 	
 NODEP_CPP_ANIMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -2682,9 +3265,9 @@ DEP_CPP_ANIMS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2695,7 +3278,7 @@ DEP_CPP_ANIMS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
@@ -2704,20 +3287,25 @@ DEP_CPP_ANIMS=\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
 	
 NODEP_CPP_ANIMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -2733,9 +3321,9 @@ DEP_CPP_ANIMS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2746,7 +3334,7 @@ DEP_CPP_ANIMS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
@@ -2755,20 +3343,25 @@ DEP_CPP_ANIMS=\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
 	
 NODEP_CPP_ANIMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -2784,9 +3377,9 @@ DEP_CPP_ANIMS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2797,7 +3390,7 @@ DEP_CPP_ANIMS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
@@ -2806,20 +3399,25 @@ DEP_CPP_ANIMS=\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
 	
 NODEP_CPP_ANIMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -2838,7 +3436,6 @@ DEP_CPP_ANIMS=\
 	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2849,7 +3446,6 @@ DEP_CPP_ANIMS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
@@ -2858,7 +3454,6 @@ DEP_CPP_ANIMS=\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
@@ -2868,35 +3463,35 @@ DEP_CPP_ANIMS=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ANIMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ANIMS=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2907,7 +3502,7 @@ DEP_CPP_ANIMS=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
@@ -2916,22 +3511,25 @@ DEP_CPP_ANIMS=\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
 	
 NODEP_CPP_ANIMS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -2946,10 +3544,6 @@ NODEP_CPP_ANIMS=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\anims.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\build_display.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
@@ -2958,9 +3552,8 @@ DEP_CPP_BUILD=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -2973,25 +3566,32 @@ DEP_CPP_BUILD=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_BUILD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3007,9 +3607,8 @@ DEP_CPP_BUILD=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -3022,25 +3621,32 @@ DEP_CPP_BUILD=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_BUILD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3056,9 +3662,8 @@ DEP_CPP_BUILD=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -3071,25 +3676,32 @@ DEP_CPP_BUILD=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_BUILD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3105,9 +3717,8 @@ DEP_CPP_BUILD=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -3120,25 +3731,32 @@ DEP_CPP_BUILD=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_BUILD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3155,9 +3773,7 @@ DEP_CPP_BUILD=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -3170,12 +3786,12 @@ DEP_CPP_BUILD=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
@@ -3185,34 +3801,34 @@ DEP_CPP_BUILD=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_BUILD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_BUILD=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -3225,27 +3841,32 @@ DEP_CPP_BUILD=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_BUILD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3272,45 +3893,52 @@ DEP_CPP_CONSO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.cpp"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\gui\console.h"\
+	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
+	"..\..\gui\newgui.h"\
+	"..\..\gui\object.h"\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_CONSO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
-	"..\..\sword2\sword2\mem_view.h"\
-	"..\..\sword2\sword2\time.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3326,45 +3954,52 @@ DEP_CPP_CONSO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.cpp"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\gui\console.h"\
+	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
+	"..\..\gui\newgui.h"\
+	"..\..\gui\object.h"\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_CONSO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
-	"..\..\sword2\sword2\mem_view.h"\
-	"..\..\sword2\sword2\time.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3380,45 +4015,52 @@ DEP_CPP_CONSO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.cpp"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\gui\console.h"\
+	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
+	"..\..\gui\newgui.h"\
+	"..\..\gui\object.h"\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_CONSO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
-	"..\..\sword2\sword2\mem_view.h"\
-	"..\..\sword2\sword2\time.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3434,45 +4076,52 @@ DEP_CPP_CONSO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.cpp"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\gui\console.h"\
+	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
+	"..\..\gui\newgui.h"\
+	"..\..\gui\object.h"\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_CONSO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
-	"..\..\sword2\sword2\mem_view.h"\
-	"..\..\sword2\sword2\time.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3490,9 +4139,7 @@ DEP_CPP_CONSO=\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.cpp"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -3503,6 +4150,7 @@ DEP_CPP_CONSO=\
 	"..\..\common\util.h"\
 	"..\..\gui\console.h"\
 	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
 	"..\..\gui\newgui.h"\
 	"..\..\gui\object.h"\
 	"..\..\sound\audiostream.h"\
@@ -3510,12 +4158,12 @@ DEP_CPP_CONSO=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
@@ -3524,72 +4172,78 @@ DEP_CPP_CONSO=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CONSO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_CONSO=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.cpp"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\gui\console.h"\
+	"..\..\gui\dialog.h"\
+	"..\..\gui\font.h"\
+	"..\..\gui\newgui.h"\
+	"..\..\gui\object.h"\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_CONSO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
-	"..\..\sword2\sword2\mem_view.h"\
-	"..\..\sword2\sword2\time.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3616,12 +4270,14 @@ DEP_CPP_CONTR=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\config-manager.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
@@ -3634,27 +4290,28 @@ DEP_CPP_CONTR=\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3670,12 +4327,14 @@ DEP_CPP_CONTR=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\config-manager.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
@@ -3688,27 +4347,28 @@ DEP_CPP_CONTR=\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3724,12 +4384,14 @@ DEP_CPP_CONTR=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\config-manager.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
@@ -3742,27 +4404,28 @@ DEP_CPP_CONTR=\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3778,12 +4441,14 @@ DEP_CPP_CONTR=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\config-manager.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
@@ -3796,27 +4461,28 @@ DEP_CPP_CONTR=\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3834,7 +4500,6 @@ DEP_CPP_CONTR=\
 	"..\..\base\engine.h"\
 	"..\..\common\config-manager.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
@@ -3856,17 +4521,14 @@ DEP_CPP_CONTR=\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
-	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
@@ -3874,30 +4536,33 @@ DEP_CPP_CONTR=\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_CONTR=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\config-manager.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
+	"..\..\common\singleton.h"\
 	"..\..\common\stdafx.h"\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
@@ -3910,29 +4575,28 @@ DEP_CPP_CONTR=\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -3951,10 +4615,6 @@ SOURCE=..\..\sword2\controls.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\credits.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\debug.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
@@ -3963,6 +4623,7 @@ DEP_CPP_DEBUG=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -3971,29 +4632,43 @@ DEP_CPP_DEBUG=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -4002,6 +4677,7 @@ DEP_CPP_DEBUG=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4010,29 +4686,43 @@ DEP_CPP_DEBUG=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -4041,6 +4731,7 @@ DEP_CPP_DEBUG=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4049,29 +4740,43 @@ DEP_CPP_DEBUG=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -4080,6 +4785,7 @@ DEP_CPP_DEBUG=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4088,29 +4794,43 @@ DEP_CPP_DEBUG=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -4120,9 +4840,7 @@ DEP_CPP_DEBUG=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -4135,12 +4853,12 @@ DEP_CPP_DEBUG=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
@@ -4149,7 +4867,6 @@ DEP_CPP_DEBUG=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
@@ -4157,24 +4874,26 @@ DEP_CPP_DEBUG=\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4183,30 +4902,43 @@ DEP_CPP_DEBUG=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -4230,6 +4962,7 @@ DEP_CPP_EVENT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4238,24 +4971,44 @@ DEP_CPP_EVENT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_EVENT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -4264,6 +5017,7 @@ DEP_CPP_EVENT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4272,24 +5026,44 @@ DEP_CPP_EVENT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_EVENT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -4298,6 +5072,7 @@ DEP_CPP_EVENT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4306,24 +5081,44 @@ DEP_CPP_EVENT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_EVENT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -4332,6 +5127,7 @@ DEP_CPP_EVENT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4340,24 +5136,44 @@ DEP_CPP_EVENT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_EVENT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -4367,9 +5183,7 @@ DEP_CPP_EVENT=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -4382,44 +5196,48 @@ DEP_CPP_EVENT=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_EVENT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_EVENT=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4428,25 +5246,44 @@ DEP_CPP_EVENT=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_EVENT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -4454,10 +5291,6 @@ NODEP_CPP_EVENT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\events.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\function.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
@@ -4466,9 +5299,8 @@ DEP_CPP_FUNCT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -4480,28 +5312,33 @@ DEP_CPP_FUNCT=\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
-	"..\..\sword2\credits.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_FUNCT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -4517,9 +5354,8 @@ DEP_CPP_FUNCT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -4531,28 +5367,33 @@ DEP_CPP_FUNCT=\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
-	"..\..\sword2\credits.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_FUNCT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -4568,9 +5409,8 @@ DEP_CPP_FUNCT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -4582,28 +5422,33 @@ DEP_CPP_FUNCT=\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
-	"..\..\sword2\credits.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_FUNCT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -4619,9 +5464,8 @@ DEP_CPP_FUNCT=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -4633,28 +5477,33 @@ DEP_CPP_FUNCT=\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
-	"..\..\sword2\credits.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_FUNCT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -4671,9 +5520,7 @@ DEP_CPP_FUNCT=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -4686,51 +5533,49 @@ DEP_CPP_FUNCT=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
-	"..\..\sword2\credits.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_FUNCT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_FUNCT=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -4742,30 +5587,33 @@ DEP_CPP_FUNCT=\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
-	"..\..\sword2\credits.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\rdwin.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_FUNCT=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -4780,10 +5628,6 @@ NODEP_CPP_FUNCT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\function.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\header.h
 # End Source File
 # Begin Source File
@@ -4796,6 +5640,7 @@ DEP_CPP_ICONS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4804,22 +5649,44 @@ DEP_CPP_ICONS=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ICONS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -4828,6 +5695,7 @@ DEP_CPP_ICONS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4836,22 +5704,44 @@ DEP_CPP_ICONS=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ICONS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -4860,6 +5750,7 @@ DEP_CPP_ICONS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4868,22 +5759,44 @@ DEP_CPP_ICONS=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ICONS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -4892,6 +5805,7 @@ DEP_CPP_ICONS=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4900,22 +5814,44 @@ DEP_CPP_ICONS=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ICONS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -4925,9 +5861,7 @@ DEP_CPP_ICONS=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -4940,44 +5874,48 @@ DEP_CPP_ICONS=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ICONS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ICONS=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -4986,23 +5924,44 @@ DEP_CPP_ICONS=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ICONS=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -5022,6 +5981,7 @@ DEP_CPP_INTER=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5030,19 +5990,43 @@ DEP_CPP_INTER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_INTER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -5051,6 +6035,7 @@ DEP_CPP_INTER=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5059,19 +6044,43 @@ DEP_CPP_INTER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_INTER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -5080,6 +6089,7 @@ DEP_CPP_INTER=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5088,19 +6098,43 @@ DEP_CPP_INTER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_INTER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -5109,6 +6143,7 @@ DEP_CPP_INTER=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5117,19 +6152,43 @@ DEP_CPP_INTER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_INTER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -5147,28 +6206,52 @@ DEP_CPP_INTER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_INTER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_INTER=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5177,20 +6260,43 @@ DEP_CPP_INTER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_INTER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -5210,6 +6316,7 @@ DEP_CPP_LAYER=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5218,22 +6325,42 @@ DEP_CPP_LAYER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_LAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -5242,6 +6369,7 @@ DEP_CPP_LAYER=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5250,22 +6378,42 @@ DEP_CPP_LAYER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_LAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -5274,6 +6422,7 @@ DEP_CPP_LAYER=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5282,22 +6431,42 @@ DEP_CPP_LAYER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_LAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -5306,6 +6475,7 @@ DEP_CPP_LAYER=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5314,22 +6484,42 @@ DEP_CPP_LAYER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_LAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -5339,9 +6529,7 @@ DEP_CPP_LAYER=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -5354,43 +6542,46 @@ DEP_CPP_LAYER=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_LAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_LAYER=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5399,23 +6590,42 @@ DEP_CPP_LAYER=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_LAYER=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -5435,6 +6645,7 @@ DEP_CPP_LOGIC=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5443,26 +6654,44 @@ DEP_CPP_LOGIC=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -5471,6 +6700,7 @@ DEP_CPP_LOGIC=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5479,26 +6709,44 @@ DEP_CPP_LOGIC=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -5507,6 +6755,7 @@ DEP_CPP_LOGIC=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5515,26 +6764,44 @@ DEP_CPP_LOGIC=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -5543,6 +6810,7 @@ DEP_CPP_LOGIC=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5551,26 +6819,44 @@ DEP_CPP_LOGIC=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -5580,9 +6866,7 @@ DEP_CPP_LOGIC=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -5595,17 +6879,18 @@ DEP_CPP_LOGIC=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
@@ -5616,25 +6901,26 @@ DEP_CPP_LOGIC=\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_LOGIC=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5643,27 +6929,44 @@ DEP_CPP_LOGIC=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -5683,9 +6986,8 @@ DEP_CPP_MAKET=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -5696,23 +6998,33 @@ DEP_CPP_MAKET=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MAKET=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -5728,9 +7040,8 @@ DEP_CPP_MAKET=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -5741,23 +7052,33 @@ DEP_CPP_MAKET=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MAKET=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -5773,9 +7094,8 @@ DEP_CPP_MAKET=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -5786,23 +7106,33 @@ DEP_CPP_MAKET=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MAKET=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -5818,9 +7148,8 @@ DEP_CPP_MAKET=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -5831,23 +7160,33 @@ DEP_CPP_MAKET=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MAKET=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -5864,9 +7203,7 @@ DEP_CPP_MAKET=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -5879,45 +7216,48 @@ DEP_CPP_MAKET=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MAKET=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MAKET=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -5928,25 +7268,33 @@ DEP_CPP_MAKET=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MAKET=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -5973,6 +7321,7 @@ DEP_CPP_MEM_V=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -5981,17 +7330,42 @@ DEP_CPP_MEM_V=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEM_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -6000,6 +7374,7 @@ DEP_CPP_MEM_V=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6008,17 +7383,42 @@ DEP_CPP_MEM_V=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEM_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -6027,6 +7427,7 @@ DEP_CPP_MEM_V=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6035,17 +7436,42 @@ DEP_CPP_MEM_V=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEM_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -6054,6 +7480,7 @@ DEP_CPP_MEM_V=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6062,17 +7489,42 @@ DEP_CPP_MEM_V=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEM_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -6082,9 +7534,7 @@ DEP_CPP_MEM_V=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6097,39 +7547,46 @@ DEP_CPP_MEM_V=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MEM_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MEM_V=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6138,18 +7595,42 @@ DEP_CPP_MEM_V=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEM_V=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -6165,6 +7646,7 @@ DEP_CPP_MEMOR=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6173,17 +7655,42 @@ DEP_CPP_MEMOR=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEMOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -6192,6 +7699,7 @@ DEP_CPP_MEMOR=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6200,17 +7708,42 @@ DEP_CPP_MEMOR=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEMOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -6219,6 +7752,7 @@ DEP_CPP_MEMOR=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6227,17 +7761,42 @@ DEP_CPP_MEMOR=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEMOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -6246,6 +7805,7 @@ DEP_CPP_MEMOR=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6254,17 +7814,42 @@ DEP_CPP_MEMOR=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEMOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -6273,6 +7858,7 @@ DEP_CPP_MEMOR=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6281,22 +7867,51 @@ DEP_CPP_MEMOR=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEMOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MEMOR=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6305,18 +7920,42 @@ DEP_CPP_MEMOR=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MEMOR=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -6336,9 +7975,8 @@ DEP_CPP_MOUSE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6354,26 +7992,29 @@ DEP_CPP_MOUSE=\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -6389,9 +8030,8 @@ DEP_CPP_MOUSE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6407,26 +8047,29 @@ DEP_CPP_MOUSE=\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -6442,9 +8085,8 @@ DEP_CPP_MOUSE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6460,26 +8102,29 @@ DEP_CPP_MOUSE=\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -6495,9 +8140,8 @@ DEP_CPP_MOUSE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6513,26 +8157,29 @@ DEP_CPP_MOUSE=\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -6549,9 +8196,7 @@ DEP_CPP_MOUSE=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6570,7 +8215,6 @@ DEP_CPP_MOUSE=\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
@@ -6580,34 +8224,34 @@ DEP_CPP_MOUSE=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MOUSE=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6623,28 +8267,29 @@ DEP_CPP_MOUSE=\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -6675,6 +8320,7 @@ DEP_CPP_PROTO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6683,18 +8329,42 @@ DEP_CPP_PROTO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
-	"..\..\sword2\defs.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
-	"..\..\sword2\protocol.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_PROTO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -6703,6 +8373,7 @@ DEP_CPP_PROTO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6711,18 +8382,42 @@ DEP_CPP_PROTO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
-	"..\..\sword2\defs.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
-	"..\..\sword2\protocol.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_PROTO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -6731,6 +8426,7 @@ DEP_CPP_PROTO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6739,18 +8435,42 @@ DEP_CPP_PROTO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
-	"..\..\sword2\defs.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
-	"..\..\sword2\protocol.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_PROTO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -6759,6 +8479,7 @@ DEP_CPP_PROTO=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6767,18 +8488,42 @@ DEP_CPP_PROTO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
-	"..\..\sword2\defs.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
-	"..\..\sword2\protocol.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_PROTO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -6788,9 +8533,7 @@ DEP_CPP_PROTO=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6803,41 +8546,46 @@ DEP_CPP_PROTO=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_PROTO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_PROTO=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -6846,19 +8594,42 @@ DEP_CPP_PROTO=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
-	"..\..\sword2\defs.h"\
+	"..\..\sword2\controls.h"\
+	"..\..\sword2\debug.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
-	"..\..\sword2\protocol.h"\
+	"..\..\sword2\mouse.h"\
+	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_PROTO=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -6866,10 +8637,6 @@ NODEP_CPP_PROTO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\protocol.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\resman.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
@@ -6878,9 +8645,9 @@ DEP_CPP_RESMA=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6893,27 +8660,31 @@ DEP_CPP_RESMA=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -6929,9 +8700,9 @@ DEP_CPP_RESMA=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6944,27 +8715,31 @@ DEP_CPP_RESMA=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -6980,9 +8755,9 @@ DEP_CPP_RESMA=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -6995,27 +8770,31 @@ DEP_CPP_RESMA=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -7031,9 +8810,9 @@ DEP_CPP_RESMA=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7046,27 +8825,31 @@ DEP_CPP_RESMA=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -7085,7 +8868,6 @@ DEP_CPP_RESMA=\
 	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7098,23 +8880,20 @@ DEP_CPP_RESMA=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
-	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
@@ -7122,27 +8901,28 @@ DEP_CPP_RESMA=\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_RESMA=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7155,29 +8935,31 @@ DEP_CPP_RESMA=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -7204,6 +8986,7 @@ DEP_CPP_ROUTE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -7212,22 +8995,43 @@ DEP_CPP_ROUTE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -7236,6 +9040,7 @@ DEP_CPP_ROUTE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -7244,22 +9049,43 @@ DEP_CPP_ROUTE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -7268,6 +9094,7 @@ DEP_CPP_ROUTE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -7276,22 +9103,43 @@ DEP_CPP_ROUTE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -7300,6 +9148,7 @@ DEP_CPP_ROUTE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -7308,22 +9157,43 @@ DEP_CPP_ROUTE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -7333,9 +9203,7 @@ DEP_CPP_ROUTE=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7348,16 +9216,17 @@ DEP_CPP_ROUTE=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
-	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
@@ -7365,25 +9234,29 @@ DEP_CPP_ROUTE=\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ROUTE=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -7392,23 +9265,43 @@ DEP_CPP_ROUTE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -7428,9 +9321,8 @@ DEP_CPP_SAVE_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7441,31 +9333,34 @@ DEP_CPP_SAVE_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
 	
 NODEP_CPP_SAVE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -7481,9 +9376,8 @@ DEP_CPP_SAVE_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7494,31 +9388,34 @@ DEP_CPP_SAVE_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
 	
 NODEP_CPP_SAVE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -7534,9 +9431,8 @@ DEP_CPP_SAVE_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7547,31 +9443,34 @@ DEP_CPP_SAVE_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
 	
 NODEP_CPP_SAVE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -7587,9 +9486,8 @@ DEP_CPP_SAVE_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7600,31 +9498,34 @@ DEP_CPP_SAVE_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
 	
 NODEP_CPP_SAVE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -7641,9 +9542,7 @@ DEP_CPP_SAVE_=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7656,52 +9555,49 @@ DEP_CPP_SAVE_=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SAVE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SAVE_=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7712,33 +9608,34 @@ DEP_CPP_SAVE_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
 	
 NODEP_CPP_SAVE_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -7765,6 +9662,7 @@ DEP_CPP_SCROL=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -7773,22 +9671,44 @@ DEP_CPP_SCROL=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	"..\..\sword2\scroll.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SCROL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -7797,6 +9717,7 @@ DEP_CPP_SCROL=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -7805,22 +9726,44 @@ DEP_CPP_SCROL=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	"..\..\sword2\scroll.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SCROL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -7829,6 +9772,7 @@ DEP_CPP_SCROL=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -7837,22 +9781,44 @@ DEP_CPP_SCROL=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	"..\..\sword2\scroll.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SCROL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -7861,6 +9827,7 @@ DEP_CPP_SCROL=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -7869,22 +9836,44 @@ DEP_CPP_SCROL=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	"..\..\sword2\scroll.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SCROL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -7894,9 +9883,7 @@ DEP_CPP_SCROL=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -7909,45 +9896,48 @@ DEP_CPP_SCROL=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCROL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SCROL=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -7956,23 +9946,44 @@ DEP_CPP_SCROL=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
-	"..\..\sword2\scroll.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SCROL=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
@@ -7980,10 +9991,6 @@ NODEP_CPP_SCROL=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\scroll.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\sound.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
@@ -7992,9 +9999,9 @@ DEP_CPP_SOUND=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8005,24 +10012,34 @@ DEP_CPP_SOUND=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8038,9 +10055,9 @@ DEP_CPP_SOUND=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8051,24 +10068,34 @@ DEP_CPP_SOUND=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8084,9 +10111,9 @@ DEP_CPP_SOUND=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8097,24 +10124,34 @@ DEP_CPP_SOUND=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8130,9 +10167,9 @@ DEP_CPP_SOUND=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8143,24 +10180,34 @@ DEP_CPP_SOUND=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8179,7 +10226,6 @@ DEP_CPP_SOUND=\
 	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8192,48 +10238,50 @@ DEP_CPP_SOUND=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8244,26 +10292,34 @@ DEP_CPP_SOUND=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8290,9 +10346,9 @@ DEP_CPP_SPEEC=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8303,16 +10359,16 @@ DEP_CPP_SPEEC=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
@@ -8320,17 +10376,17 @@ DEP_CPP_SPEEC=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
 	
 NODEP_CPP_SPEEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8346,9 +10402,9 @@ DEP_CPP_SPEEC=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8359,16 +10415,16 @@ DEP_CPP_SPEEC=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
@@ -8376,17 +10432,17 @@ DEP_CPP_SPEEC=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
 	
 NODEP_CPP_SPEEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8402,9 +10458,9 @@ DEP_CPP_SPEEC=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8415,16 +10471,16 @@ DEP_CPP_SPEEC=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
@@ -8432,17 +10488,17 @@ DEP_CPP_SPEEC=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
 	
 NODEP_CPP_SPEEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8458,9 +10514,9 @@ DEP_CPP_SPEEC=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8471,16 +10527,16 @@ DEP_CPP_SPEEC=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
@@ -8488,17 +10544,17 @@ DEP_CPP_SPEEC=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
 	
 NODEP_CPP_SPEEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8517,7 +10573,6 @@ DEP_CPP_SPEEC=\
 	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8528,7 +10583,6 @@ DEP_CPP_SPEEC=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
@@ -8537,8 +10591,6 @@ DEP_CPP_SPEEC=\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
@@ -8548,35 +10600,35 @@ DEP_CPP_SPEEC=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SPEEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SPEEC=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8587,16 +10639,16 @@ DEP_CPP_SPEEC=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
-	"..\..\sword2\anims.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
@@ -8604,19 +10656,17 @@ DEP_CPP_SPEEC=\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\walker.h"\
 	
 NODEP_CPP_SPEEC=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8643,9 +10693,9 @@ DEP_CPP_START=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8658,29 +10708,30 @@ DEP_CPP_START=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
-	"..\..\sword2\tony_gsdk.h"\
 	
 NODEP_CPP_START=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8696,9 +10747,9 @@ DEP_CPP_START=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8711,29 +10762,30 @@ DEP_CPP_START=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
-	"..\..\sword2\tony_gsdk.h"\
 	
 NODEP_CPP_START=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8749,9 +10801,9 @@ DEP_CPP_START=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8764,29 +10816,30 @@ DEP_CPP_START=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
-	"..\..\sword2\tony_gsdk.h"\
 	
 NODEP_CPP_START=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8802,9 +10855,9 @@ DEP_CPP_START=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8817,29 +10870,30 @@ DEP_CPP_START=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
-	"..\..\sword2\tony_gsdk.h"\
 	
 NODEP_CPP_START=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8858,7 +10912,6 @@ DEP_CPP_START=\
 	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8871,15 +10924,13 @@ DEP_CPP_START=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
-	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
@@ -8893,29 +10944,28 @@ DEP_CPP_START=\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
-	"..\..\sword2\tony_gsdk.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_START=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_START=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -8928,31 +10978,30 @@ DEP_CPP_START=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
-	"..\..\sword2\tony_gsdk.h"\
 	
 NODEP_CPP_START=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -8976,13 +11025,14 @@ SOURCE=..\..\sword2\sword2.cpp
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SWORD=\
+	"..\..\backends\fs\fs.h"\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\base\gameDetector.h"\
 	"..\..\base\plugins.h"\
 	"..\..\common\config-manager.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
@@ -8999,35 +11049,30 @@ DEP_CPP_SWORD=\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
-	"..\..\sword2\credits.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -9040,13 +11085,14 @@ NODEP_CPP_SWORD=\
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SWORD=\
+	"..\..\backends\fs\fs.h"\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\base\gameDetector.h"\
 	"..\..\base\plugins.h"\
 	"..\..\common\config-manager.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
@@ -9063,35 +11109,30 @@ DEP_CPP_SWORD=\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
-	"..\..\sword2\credits.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -9104,13 +11145,14 @@ NODEP_CPP_SWORD=\
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
 DEP_CPP_SWORD=\
+	"..\..\backends\fs\fs.h"\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\base\gameDetector.h"\
 	"..\..\base\plugins.h"\
 	"..\..\common\config-manager.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
@@ -9127,35 +11169,30 @@ DEP_CPP_SWORD=\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
-	"..\..\sword2\credits.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -9168,13 +11205,14 @@ NODEP_CPP_SWORD=\
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SWORD=\
+	"..\..\backends\fs\fs.h"\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\base\gameDetector.h"\
 	"..\..\base\plugins.h"\
 	"..\..\common\config-manager.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
@@ -9191,35 +11229,30 @@ DEP_CPP_SWORD=\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
-	"..\..\sword2\credits.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -9240,7 +11273,6 @@ DEP_CPP_SWORD=\
 	"..\..\base\plugins.h"\
 	"..\..\common\config-manager.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
@@ -9257,54 +11289,50 @@ DEP_CPP_SWORD=\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
-	"..\..\sword2\credits.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
-	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SWORD=\
+	"..\..\backends\fs\fs.h"\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\base\gameDetector.h"\
 	"..\..\base\plugins.h"\
 	"..\..\common\config-manager.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
@@ -9321,37 +11349,30 @@ DEP_CPP_SWORD=\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
 	"..\..\sword2\controls.h"\
-	"..\..\sword2\credits.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\driver\palette.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
 	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
-	"..\..\sword2\scroll.h"\
 	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -9377,111 +11398,8 @@ SOURCE=..\..\sword2\sync.cpp
 DEP_CPP_SYNC_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
-	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
-	"..\..\sword2\memory.h"\
-	"..\..\sword2\object.h"\
-	"..\..\sword2\resman.h"\
-	"..\..\sword2\sync.h"\
-	
-NODEP_CPP_SYNC_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_SYNC_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
-	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
-	"..\..\sword2\memory.h"\
-	"..\..\sword2\object.h"\
-	"..\..\sword2\resman.h"\
-	"..\..\sword2\sync.h"\
-	
-NODEP_CPP_SYNC_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
-
-DEP_CPP_SYNC_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
-	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
-	"..\..\sword2\memory.h"\
-	"..\..\sword2\object.h"\
-	"..\..\sword2\resman.h"\
-	"..\..\sword2\sync.h"\
-	
-NODEP_CPP_SYNC_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SYNC_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
-	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
-	"..\..\sword2\memory.h"\
-	"..\..\sword2\object.h"\
-	"..\..\sword2\resman.h"\
-	"..\..\sword2\sync.h"\
-	
-NODEP_CPP_SYNC_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_SYNC_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -9490,93 +11408,37 @@ DEP_CPP_SYNC_=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
 	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
-	"..\..\sword2\sync.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_SYNC_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_SYNC_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sword2\debug.h"\
-	"..\..\sword2\defs.h"\
-	"..\..\sword2\header.h"\
-	"..\..\sword2\interpreter.h"\
-	"..\..\sword2\memory.h"\
-	"..\..\sword2\object.h"\
-	"..\..\sword2\resman.h"\
-	"..\..\sword2\sync.h"\
-	
-NODEP_CPP_SYNC_=\
-	"..\..\common\config.h"\
-	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
-	".\DL_byteorder.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sword2\sync.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sword2\tony_gsdk.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-DEP_CPP_TONY_=\
-	"..\..\backends\wince\missing\unistd.h"\
-	"..\..\backends\wince\portdefs.h"\
-	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
-	"..\..\common\list.h"\
-	"..\..\common\map.h"\
-	"..\..\common\rect.h"\
-	"..\..\common\savefile.h"\
-	"..\..\common\scummsys.h"\
-	"..\..\common\stdafx.h"\
-	"..\..\common\str.h"\
-	"..\..\common\system.h"\
-	"..\..\common\util.h"\
-	"..\..\sound\audiostream.h"\
-	"..\..\sound\mixer.h"\
-	"..\..\sound\rate.h"\
-	"..\..\sword2\debug.h"\
-	"..\..\sword2\driver\d_sound.h"\
-	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\memory.h"\
-	"..\..\sword2\object.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\tony_gsdk.h"\
 	
-NODEP_CPP_TONY_=\
+NODEP_CPP_SYNC_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -9588,13 +11450,12 @@ NODEP_CPP_TONY_=\
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_TONY_=\
+DEP_CPP_SYNC_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -9605,18 +11466,34 @@ DEP_CPP_TONY_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\tony_gsdk.h"\
 	
-NODEP_CPP_TONY_=\
+NODEP_CPP_SYNC_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -9628,13 +11505,12 @@ NODEP_CPP_TONY_=\
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_TONY_=\
+DEP_CPP_SYNC_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -9645,18 +11521,34 @@ DEP_CPP_TONY_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\tony_gsdk.h"\
 	
-NODEP_CPP_TONY_=\
+NODEP_CPP_SYNC_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -9668,13 +11560,12 @@ NODEP_CPP_TONY_=\
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_TONY_=\
+DEP_CPP_SYNC_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -9685,18 +11576,34 @@ DEP_CPP_TONY_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\tony_gsdk.h"\
 	
-NODEP_CPP_TONY_=\
+NODEP_CPP_SYNC_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -9708,14 +11615,12 @@ NODEP_CPP_TONY_=\
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_TONY_=\
+DEP_CPP_SYNC_=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -9728,42 +11633,49 @@ DEP_CPP_TONY_=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
+	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
 	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\tony_gsdk.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
-NODEP_CPP_TONY_=\
+NODEP_CPP_SYNC_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
-DEP_CPP_TONY_=\
+DEP_CPP_SYNC_=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
-	"..\..\common\file.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -9774,20 +11686,34 @@ DEP_CPP_TONY_=\
 	"..\..\sound\audiostream.h"\
 	"..\..\sound\mixer.h"\
 	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
+	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
+	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
+	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
+	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
+	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
+	"..\..\sword2\resman.h"\
+	"..\..\sword2\router.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\tony_gsdk.h"\
 	
-NODEP_CPP_TONY_=\
+NODEP_CPP_SYNC_=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sound\stdafx.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
 	".\ad.h"\
 	".\DL_byteorder.h"\
 	".\orbis\config_types.h"\
@@ -9802,10 +11728,6 @@ NODEP_CPP_TONY_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\tony_gsdk.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\walker.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
@@ -9814,6 +11736,7 @@ DEP_CPP_WALKE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -9822,27 +11745,44 @@ DEP_CPP_WALKE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
@@ -9851,6 +11791,7 @@ DEP_CPP_WALKE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -9859,27 +11800,44 @@ DEP_CPP_WALKE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -9888,6 +11846,7 @@ DEP_CPP_WALKE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -9896,27 +11855,44 @@ DEP_CPP_WALKE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
@@ -9925,6 +11901,7 @@ DEP_CPP_WALKE=\
 	"..\..\backends\wince\missing\unistd.h"\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -9933,27 +11910,44 @@ DEP_CPP_WALKE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
@@ -9963,9 +11957,7 @@ DEP_CPP_WALKE=\
 	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
 	"..\..\common\debugger.h"\
-	"..\..\common\file.h"\
 	"..\..\common\list.h"\
-	"..\..\common\map.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
 	"..\..\common\scummsys.h"\
@@ -9978,22 +11970,21 @@ DEP_CPP_WALKE=\
 	"..\..\sound\rate.h"\
 	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
 	"..\..\sword2\driver\d_draw.h"\
 	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
 	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
 	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
 	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
 	"..\..\sword2\save_rest.h"\
@@ -10001,25 +11992,26 @@ DEP_CPP_WALKE=\
 	"..\..\sword2\speech.h"\
 	"..\..\sword2\startup.h"\
 	"..\..\sword2\sword2.h"\
-	"..\..\sword2\sync.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_WALKE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
 DEP_CPP_WALKE=\
 	"..\..\backends\wince\missing\unistd.h"\
+	"..\..\backends\wince\portdefs.h"\
 	"..\..\base\engine.h"\
+	"..\..\common\debugger.h"\
 	"..\..\common\list.h"\
 	"..\..\common\rect.h"\
 	"..\..\common\savefile.h"\
@@ -10028,37 +12020,49 @@ DEP_CPP_WALKE=\
 	"..\..\common\str.h"\
 	"..\..\common\system.h"\
 	"..\..\common\util.h"\
+	"..\..\sound\audiostream.h"\
+	"..\..\sound\mixer.h"\
+	"..\..\sound\rate.h"\
+	"..\..\sword2\build_display.h"\
 	"..\..\sword2\console.h"\
+	"..\..\sword2\controls.h"\
 	"..\..\sword2\debug.h"\
 	"..\..\sword2\defs.h"\
+	"..\..\sword2\driver\d_draw.h"\
+	"..\..\sword2\driver\d_sound.h"\
 	"..\..\sword2\driver\driver96.h"\
-	"..\..\sword2\events.h"\
-	"..\..\sword2\function.h"\
 	"..\..\sword2\header.h"\
+	"..\..\sword2\icons.h"\
 	"..\..\sword2\interpreter.h"\
+	"..\..\sword2\layers.h"\
 	"..\..\sword2\logic.h"\
+	"..\..\sword2\maketext.h"\
 	"..\..\sword2\memory.h"\
+	"..\..\sword2\mouse.h"\
 	"..\..\sword2\object.h"\
-	"..\..\sword2\protocol.h"\
 	"..\..\sword2\resman.h"\
 	"..\..\sword2\router.h"\
-	"..\..\sword2\sync.h"\
+	"..\..\sword2\save_rest.h"\
+	"..\..\sword2\sound.h"\
+	"..\..\sword2\speech.h"\
+	"..\..\sword2\startup.h"\
+	"..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
 	"..\..\common\config.h"\
 	"..\..\common\extend.h"\
-	"..\..\sword2\stdafx.h"\
-	"..\..\sword2\sword2\driver.h"\
+	".\ad.h"\
 	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ENDIF 
 
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\sword2\walker.h
-# End Source File
 # End Group
 # Begin Group "Header Files"