Update project files

svn-id: r13814

1 files changed, 403 insertions, 238 deletions

diff --git a/dists/msevc4/sword1/sword1.vcp b/dists/msevc4/sword1/sword1.vcp
index af8f94e838..fbb411f5dd 100644
--- a/dists/msevc4/sword1/sword1.vcp
+++ b/dists/msevc4/sword1/sword1.vcp
@@ -55,15 +55,15 @@ CFG=sword1 - Win32 (WCE emulator) Debug
 # PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
-# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /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 "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
+# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
@@ -81,15 +81,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
 # 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 "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /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 "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
@@ -107,15 +107,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
 # 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 "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /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" /D "WIN32" /YX /O2 /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 "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /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 "WIN32" /D "DISABLE_SAGA" /D "DISABLE_KYRA" /D "DISABLE_AWE" /D "USE_MPEG2" /YX /O2 /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
 
@@ -133,15 +133,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
 # 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 "ARMV4" /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/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "_LIB" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /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 "USE_MPEG2" /D "WIN32" /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 "ARMV4" /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/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "_LIB" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /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 "USE_MPEG2" /D "WIN32" /D "DISABLE_SAGA" /D "DISABLE_KYRA" /D "DISABLE_AWE" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
 
@@ -161,7 +161,7 @@ BSC32=bscmake.exe
 # 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" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /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 "USE_MPEG2" /D "WIN32" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /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 "USE_MPEG2" /D "WIN32" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /YX /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -187,7 +187,7 @@ BSC32=bscmake.exe
 # 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" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /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 "USE_MPEG2" /D "WIN32" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /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 "USE_MPEG2" /D "WIN32" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -239,7 +239,7 @@ BSC32=bscmake.exe
 # 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" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /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 "USE_MPEG2" /D "WIN32" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /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 "USE_MPEG2" /D "WIN32" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -291,7 +291,7 @@ BSC32=bscmake.exe
 # 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" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /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 "USE_MPEG2" /D "WIN32" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /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 "USE_MPEG2" /D "WIN32" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -325,7 +325,7 @@ SOURCE=..\..\..\sword1\animation.cpp
 NODEP_CPP_ANIMA=\
 	"..\..\..\sword1\common\file.h"\
 	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\sound\vorbis.h"\
+	"..\..\..\sword1\sound\audiostream.h"\
 	"..\..\..\sword1\sword1\animation.h"\
 	
 
@@ -334,7 +334,7 @@ NODEP_CPP_ANIMA=\
 NODEP_CPP_ANIMA=\
 	"..\..\..\sword1\common\file.h"\
 	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\sound\vorbis.h"\
+	"..\..\..\sword1\sound\audiostream.h"\
 	"..\..\..\sword1\sword1\animation.h"\
 	
 
@@ -343,18 +343,20 @@ NODEP_CPP_ANIMA=\
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
+	"..\..\..\graphics\animation.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sword1\animation.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\screen.h"\
@@ -364,6 +366,7 @@ DEP_CPP_ANIMA=\
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
+	".\peg2dec\mpeg2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
@@ -371,18 +374,19 @@ NODEP_CPP_ANIMA=\
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sword1\animation.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\screen.h"\
@@ -391,8 +395,8 @@ DEP_CPP_ANIMA=\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
+	"..\..\..\sword1\graphics\animation.h"\
 	".\DL_byteorder.h"\
-	".\peg2dec\mpeg2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
@@ -417,10 +421,10 @@ DEP_CPP_ANIMA=\
 	"..\..\..\sword1\screen.h"\
 	"..\..\..\sword1\sound.h"\
 	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
@@ -430,6 +434,7 @@ DEP_CPP_ANIMA=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -439,16 +444,16 @@ DEP_CPP_ANIMA=\
 	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sword1\animation.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\screen.h"\
 	"..\..\..\sword1\sound.h"\
 	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
+	".\peg2dec\mpeg2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -473,10 +478,10 @@ DEP_CPP_ANIMA=\
 	"..\..\..\sword1\screen.h"\
 	"..\..\..\sword1\sound.h"\
 	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
@@ -501,10 +506,10 @@ DEP_CPP_ANIMA=\
 	"..\..\..\sword1\screen.h"\
 	"..\..\..\sword1\sound.h"\
 	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
@@ -529,10 +534,10 @@ DEP_CPP_ANIMA=\
 	"..\..\..\sword1\screen.h"\
 	"..\..\..\sword1\sound.h"\
 	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -557,10 +562,10 @@ DEP_CPP_ANIMA=\
 	"..\..\..\sword1\screen.h"\
 	"..\..\..\sword1\sound.h"\
 	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ENDIF 
@@ -643,18 +648,24 @@ DEP_CPP_CONTR=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
+	"..\..\..\sword1\control.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\mouse.h"\
@@ -668,7 +679,6 @@ DEP_CPP_CONTR=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_CONTR=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -680,19 +690,24 @@ DEP_CPP_CONTR=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
+	"..\..\..\sword1\control.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\mouse.h"\
@@ -742,6 +757,23 @@ NODEP_CPP_CONTR=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_CONTR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\mouse.h"\
@@ -755,17 +787,8 @@ DEP_CPP_CONTR=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_CONTR=\
-	"..\..\..\sword1\base\engine.h"\
-	"..\..\..\sword1\base\gameDetector.h"\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\sound\audiostream.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\sound\rate.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -922,15 +945,13 @@ NODEP_CPP_DEBUG=\
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\debug.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -940,10 +961,8 @@ NODEP_CPP_DEBUG=\
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
 	"..\..\..\sword1\debug.h"\
@@ -967,12 +986,17 @@ NODEP_CPP_DEBUG=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_DEBUG=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\debug.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -1061,17 +1085,15 @@ NODEP_CPP_EVENT=\
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\eventman.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -1081,10 +1103,8 @@ NODEP_CPP_EVENT=\
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
 	"..\..\..\sword1\eventman.h"\
@@ -1112,14 +1132,19 @@ NODEP_CPP_EVENT=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\eventman.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -1262,18 +1287,22 @@ DEP_CPP_LOGIC=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
+	"..\..\..\graphics\animation.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
+	"..\..\..\sword1\animation.h"\
 	"..\..\..\sword1\debug.h"\
 	"..\..\..\sword1\eventman.h"\
 	"..\..\..\sword1\logic.h"\
@@ -1293,9 +1322,9 @@ DEP_CPP_LOGIC=\
 	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_LOGIC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
+	".\peg2dec\mpeg2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
@@ -1305,13 +1334,14 @@ DEP_CPP_LOGIC=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
@@ -1339,8 +1369,8 @@ DEP_CPP_LOGIC=\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\..\common\extend.h"\
+	"..\..\..\sword1\graphics\animation.h"\
 	".\DL_byteorder.h"\
-	".\peg2dec\mpeg2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
@@ -1384,6 +1414,23 @@ NODEP_CPP_LOGIC=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
 	"..\..\..\sword1\animation.h"\
 	"..\..\..\sword1\debug.h"\
 	"..\..\..\sword1\eventman.h"\
@@ -1404,19 +1451,9 @@ DEP_CPP_LOGIC=\
 	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_LOGIC=\
-	"..\..\..\sword1\base\engine.h"\
-	"..\..\..\sword1\base\gameDetector.h"\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\sound\audiostream.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\sound\rate.h"\
-	"..\..\..\sword1\stdafx.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sound.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
+	".\peg2dec\mpeg2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -1609,15 +1646,13 @@ NODEP_CPP_MEMMA=\
 DEP_CPP_MEMMA=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
 	
 NODEP_CPP_MEMMA=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -1627,10 +1662,8 @@ NODEP_CPP_MEMMA=\
 DEP_CPP_MEMMA=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
@@ -1654,12 +1687,17 @@ NODEP_CPP_MEMMA=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_MEMMA=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
 	
 NODEP_CPP_MEMMA=\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -1764,14 +1802,18 @@ NODEP_CPP_MENU_=\
 DEP_CPP_MENU_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\menu.h"\
@@ -1783,7 +1825,6 @@ DEP_CPP_MENU_=\
 	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_MENU_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -1793,12 +1834,14 @@ NODEP_CPP_MENU_=\
 DEP_CPP_MENU_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
@@ -1843,6 +1886,19 @@ NODEP_CPP_MENU_=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_MENU_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\menu.h"\
@@ -1854,12 +1910,8 @@ DEP_CPP_MENU_=\
 	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_MENU_=\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\stdafx.h"\
-	"..\..\..\sword1\system.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -2010,14 +2062,18 @@ NODEP_CPP_MOUSE=\
 DEP_CPP_MOUSE=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\menu.h"\
@@ -2030,7 +2086,6 @@ DEP_CPP_MOUSE=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_MOUSE=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -2040,12 +2095,14 @@ NODEP_CPP_MOUSE=\
 DEP_CPP_MOUSE=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
@@ -2092,6 +2149,19 @@ NODEP_CPP_MOUSE=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_MOUSE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\menu.h"\
@@ -2104,12 +2174,8 @@ DEP_CPP_MOUSE=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_MOUSE=\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\stdafx.h"\
-	"..\..\..\sword1\system.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -2253,21 +2319,23 @@ DEP_CPP_MUSIC=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
 	"..\..\..\sword1\music.h"\
 	
 NODEP_CPP_MUSIC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -2278,12 +2346,14 @@ DEP_CPP_MUSIC=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
@@ -2316,17 +2386,27 @@ NODEP_CPP_MUSIC=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_MUSIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
 	"..\..\..\sword1\music.h"\
 	
 NODEP_CPP_MUSIC=\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\sound\audiostream.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\sound\rate.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -2455,15 +2535,17 @@ DEP_CPP_OBJEC=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\objectman.h"\
@@ -2473,7 +2555,6 @@ DEP_CPP_OBJEC=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_OBJEC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -2485,13 +2566,14 @@ DEP_CPP_OBJEC=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
@@ -2531,6 +2613,20 @@ NODEP_CPP_OBJEC=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_OBJEC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\objectman.h"\
@@ -2540,12 +2636,8 @@ DEP_CPP_OBJEC=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_OBJEC=\
-	"..\..\..\sword1\base\engine.h"\
-	"..\..\..\sword1\base\gameDetector.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -2677,21 +2769,23 @@ DEP_CPP_RESMA=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\resman.h"\
 	"..\..\..\sword1\sworddefs.h"\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_RESMA=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -2702,12 +2796,14 @@ DEP_CPP_RESMA=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
@@ -2740,17 +2836,27 @@ NODEP_CPP_RESMA=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_RESMA=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\resman.h"\
 	"..\..\..\sword1\sworddefs.h"\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_RESMA=\
-	"..\..\..\sword1\base\engine.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -2869,14 +2975,14 @@ NODEP_CPP_ROUTE=\
 DEP_CPP_ROUTE=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\objectman.h"\
@@ -2886,7 +2992,6 @@ DEP_CPP_ROUTE=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_ROUTE=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -2896,13 +3001,12 @@ NODEP_CPP_ROUTE=\
 DEP_CPP_ROUTE=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
@@ -2939,6 +3043,15 @@ NODEP_CPP_ROUTE=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_ROUTE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\objectman.h"\
@@ -2948,10 +3061,8 @@ DEP_CPP_ROUTE=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_ROUTE=\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -3092,15 +3203,20 @@ DEP_CPP_SCREE=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
+	"..\..\..\graphics\animation.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sword1\animation.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\menu.h"\
@@ -3108,14 +3224,15 @@ DEP_CPP_SCREE=\
 	"..\..\..\sword1\objectman.h"\
 	"..\..\..\sword1\resman.h"\
 	"..\..\..\sword1\screen.h"\
+	"..\..\..\sword1\sound.h"\
 	"..\..\..\sword1\sword1.h"\
 	"..\..\..\sword1\sworddefs.h"\
 	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_SCREE=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
+	".\peg2dec\mpeg2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
@@ -3125,17 +3242,17 @@ DEP_CPP_SCREE=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sword1\animation.h"\
 	"..\..\..\sword1\logic.h"\
@@ -3152,8 +3269,8 @@ DEP_CPP_SCREE=\
 	
 NODEP_CPP_SCREE=\
 	"..\..\..\common\extend.h"\
+	"..\..\..\sword1\graphics\animation.h"\
 	".\DL_byteorder.h"\
-	".\peg2dec\mpeg2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
@@ -3188,6 +3305,22 @@ NODEP_CPP_SCREE=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_SCREE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\..\..\sword1\animation.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
@@ -3196,22 +3329,15 @@ DEP_CPP_SCREE=\
 	"..\..\..\sword1\objectman.h"\
 	"..\..\..\sword1\resman.h"\
 	"..\..\..\sword1\screen.h"\
+	"..\..\..\sword1\sound.h"\
 	"..\..\..\sword1\sword1.h"\
 	"..\..\..\sword1\sworddefs.h"\
 	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_SCREE=\
-	"..\..\..\sword1\base\engine.h"\
-	"..\..\..\sword1\base\gameDetector.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\sound\audiostream.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\stdafx.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\system.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
+	".\peg2dec\mpeg2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -3394,15 +3520,17 @@ DEP_CPP_SOUND=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
@@ -3414,7 +3542,6 @@ DEP_CPP_SOUND=\
 	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -3426,13 +3553,14 @@ DEP_CPP_SOUND=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
@@ -3477,6 +3605,21 @@ NODEP_CPP_SOUND=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_SOUND=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\object.h"\
@@ -3487,14 +3630,8 @@ DEP_CPP_SOUND=\
 	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_SOUND=\
-	"..\..\..\sword1\base\engine.h"\
-	"..\..\..\sword1\base\gameDetector.h"\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -3665,15 +3802,17 @@ DEP_CPP_STATI=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
@@ -3690,7 +3829,6 @@ DEP_CPP_STATI=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_STATI=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -3702,13 +3840,14 @@ DEP_CPP_STATI=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
@@ -3764,6 +3903,23 @@ NODEP_CPP_STATI=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_STATI=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\menu.h"\
 	"..\..\..\sword1\music.h"\
@@ -3777,17 +3933,8 @@ DEP_CPP_STATI=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_STATI=\
-	"..\..\..\sword1\base\engine.h"\
-	"..\..\..\sword1\base\gameDetector.h"\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\sound\audiostream.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\sound\rate.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -3992,19 +4139,21 @@ DEP_CPP_SWORD=\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
 	"..\..\..\base\plugins.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
@@ -4023,7 +4172,6 @@ DEP_CPP_SWORD=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_SWORD=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
 	".\DL_byteorder.h"\
@@ -4038,16 +4186,17 @@ DEP_CPP_SWORD=\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\gameDetector.h"\
 	"..\..\..\base\plugins.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
@@ -4113,6 +4262,29 @@ NODEP_CPP_SWORD=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) 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\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\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
 	"..\..\..\sword1\logic.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\menu.h"\
@@ -4128,21 +4300,9 @@ DEP_CPP_SWORD=\
 	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_SWORD=\
-	"..\..\..\sword1\backends\fs\fs.h"\
-	"..\..\..\sword1\base\engine.h"\
-	"..\..\..\sword1\base\gameDetector.h"\
-	"..\..\..\sword1\base\plugins.h"\
-	"..\..\..\sword1\common\config-manager.h"\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\timer.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\sound\audiostream.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\sound\rate.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
@@ -4345,14 +4505,14 @@ NODEP_CPP_TEXT_=\
 DEP_CPP_TEXT_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\objectman.h"\
@@ -4362,7 +4522,6 @@ DEP_CPP_TEXT_=\
 	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_TEXT_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	
@@ -4372,13 +4531,12 @@ NODEP_CPP_TEXT_=\
 DEP_CPP_TEXT_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
@@ -4415,6 +4573,15 @@ NODEP_CPP_TEXT_=\
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_TEXT_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\config.h"\
 	"..\..\..\sword1\memman.h"\
 	"..\..\..\sword1\object.h"\
 	"..\..\..\sword1\objectman.h"\
@@ -4424,10 +4591,8 @@ DEP_CPP_TEXT_=\
 	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_TEXT_=\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\file.h"\
-	"..\..\..\sword1\scummsys.h"\
-	"..\..\..\sword1\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"