From c5f20f176463a8fe17a120dbb2436141df9a0b4b Mon Sep 17 00:00:00 2001
From: Kostas Nakos
Date: Sun, 11 Jun 2006 20:24:14 +0000
Subject: updated the CE project files for the 0.9.0 codebase

svn-id: r23029
---
 dists/msevc4/PocketSCUMM.vcw     |    17 +-
 dists/msevc4/gob/gob.vcp         |  2452 ++-
 dists/msevc4/kyra/kyra.vcp       |   633 +
 dists/msevc4/queen/queen.vcp     |  3638 +++--
 dists/msevc4/saga/saga.vcp       |  4341 ++----
 dists/msevc4/scumm/scumm.vcp     | 20194 +++++++++++++------------
 dists/msevc4/scummvm/scummvm.vcp | 30166 +++++++++++++++++++++++--------------
 dists/msevc4/simon/simon.vcp     |  4234 ++++--
 dists/msevc4/sky/sky.vcp         |  3411 +++--
 dists/msevc4/sword1/sword1.vcp   |  3312 ++--
 dists/msevc4/sword2/sword2.vcp   |  7409 +++++----
 11 files changed, 43664 insertions(+), 36143 deletions(-)
 create mode 100644 dists/msevc4/kyra/kyra.vcp

diff --git a/dists/msevc4/PocketSCUMM.vcw b/dists/msevc4/PocketSCUMM.vcw
index e3d49dbfd9..55f8228d3d 100644
--- a/dists/msevc4/PocketSCUMM.vcw
+++ b/dists/msevc4/PocketSCUMM.vcw
@@ -1,4 +1,4 @@
-Microsoft eMbedded Visual Tools Workspace File, Format Version 4.00
+Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
@@ -15,6 +15,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "kyra"=.\kyra\kyra.vcp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "queen"=.\queen\queen.vcp - Package Owner=<4>
 
 Package=<5>
@@ -83,6 +95,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name saga
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name kyra
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/dists/msevc4/gob/gob.vcp b/dists/msevc4/gob/gob.vcp
index ac8297be5b..dcaece5b5a 100644
--- a/dists/msevc4/gob/gob.vcp
+++ b/dists/msevc4/gob/gob.vcp
@@ -2,6 +2,7 @@
 # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
 # ** DO NOT EDIT **
 
+# TARGTYPE "Win32 (WCE ARM) Static Library" 0x8504
 # TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304
 # TARGTYPE "Win32 (WCE emulator) Static Library" 0xa604
 
@@ -22,6 +23,7 @@ CFG=gob - Win32 (WCE emulator) Debug
 !MESSAGE "gob - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Static Library")
 !MESSAGE "gob - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library")
 !MESSAGE "gob - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library")
+!MESSAGE "gob - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -46,15 +48,15 @@ CFG=gob - 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)" == "gob - Win32 (WCE emulator) Debug"
 
@@ -72,15 +74,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)" == "gob - Win32 (WCE ARMV4) Release"
 
@@ -98,15 +100,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/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /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 _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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
@@ -124,9 +126,37 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
+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 "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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug) /c
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ARMRel"
+# PROP BASE Intermediate_Dir "ARMRel"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ARMRel"
+# PROP Intermediate_Dir "ARMRel"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Sec_AlwaysSign 0
+# PROP Sec_ConfigureDevice 0
+# 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 "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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug)  /c
+# 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 "../../../engines" /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_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /FR /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -142,53 +172,29 @@ BSC32=bscmake.exe
 # Name "gob - Win32 (WCE emulator) Debug"
 # Name "gob - Win32 (WCE ARMV4) Release"
 # Name "gob - Win32 (WCE ARMV4) Debug"
+# Name "gob - Win32 (WCE ARM) Release"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\gob\anim.cpp
-
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ANIM_=\
-	"..\..\..\gob\gob\anim.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\video.h"\
-	
-
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ANIM_=\
-	"..\..\..\gob\gob\anim.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\video.h"\
-	
-
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
-
+SOURCE=..\..\..\engines\gob\anim.cpp
 DEP_CPP_ANIM_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\anim.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\anim.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\video.h"\
 	
 NODEP_CPP_ANIM_=\
 	"..\..\..\common\config.h"\
@@ -197,557 +203,586 @@ NODEP_CPP_ANIM_=\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_ANIM_=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\anim.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\cdrom.cpp
+DEP_CPP_CDROM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\anim.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_ANIM_=\
+NODEP_CPP_CDROM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\anim.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\cdrom.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_CDROM=\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\sound\audiocd.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_CDROM=\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\sound\audiocd.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\cdrom.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_CDROM=\
+SOURCE=..\..\..\engines\gob\dataio.cpp
+DEP_CPP_DATAI=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\pack.h"\
+	"..\..\..\engines\gob\video.h"\
 	
-NODEP_CPP_CDROM=\
+NODEP_CPP_DATAI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_CDROM=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\dataio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\draw.cpp
+DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\audiocd.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\palanim.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CDROM=\
+NODEP_CPP_DRAW_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\cdrom.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\dataio.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_DATAI=\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\pack.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_DATAI=\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\pack.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\draw.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_DATAI=\
+SOURCE=..\..\..\engines\gob\draw_v1.cpp
+DEP_CPP_DRAW_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\pack.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_DATAI=\
+NODEP_CPP_DRAW_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_DATAI=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\draw_v2.cpp
+DEP_CPP_DRAW_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\pack.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_DATAI=\
+NODEP_CPP_DRAW_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gob\dataio.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\draw.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_DRAW_=\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\palanim.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-NODEP_CPP_DRAW_=\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\palanim.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_DRAW_=\
+SOURCE=..\..\..\engines\gob\driver_vga.cpp
+DEP_CPP_DRIVE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\palanim.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\driver_vga.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_DRAW_=\
+NODEP_CPP_DRIVE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_DRAW_=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\driver_vga.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\game.cpp
+DEP_CPP_GAME_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\palanim.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\music.h"\
+	"..\..\..\engines\gob\pack.h"\
+	"..\..\..\engines\gob\palanim.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_DRAW_=\
+NODEP_CPP_GAME_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\draw.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\driver_vga.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_DRIVE=\
-	"..\..\..\gob\gob\driver_vga.h"\
-	"..\..\..\gob\graphics\primitives.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_DRIVE=\
-	"..\..\..\gob\gob\driver_vga.h"\
-	"..\..\..\gob\graphics\primitives.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\game.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_DRIVE=\
+SOURCE=..\..\..\engines\gob\game_v1.cpp
+DEP_CPP_GAME_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\driver_vga.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\graphics\primitives.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\music.h"\
+	"..\..\..\engines\gob\pack.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DRIVE=\
+NODEP_CPP_GAME_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_DRIVE=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\game_v2.cpp
+DEP_CPP_GAME_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\driver_vga.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\graphics\primitives.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\music.h"\
+	"..\..\..\engines\gob\pack.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DRIVE=\
+NODEP_CPP_GAME_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gob\driver_vga.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\game.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_GAME_=\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\goblin.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\mult.h"\
-	"..\..\..\gob\gob\pack.h"\
-	"..\..\..\gob\gob\parse.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-NODEP_CPP_GAME_=\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\goblin.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\mult.h"\
-	"..\..\..\gob\gob\pack.h"\
-	"..\..\..\gob\gob\parse.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_GAME_=\
+SOURCE=..\..\..\engines\gob\global.cpp
+DEP_CPP_GLOBA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\goblin.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\mult.h"\
-	"..\..\..\gob\pack.h"\
-	"..\..\..\gob\parse.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\video.h"\
 	
-NODEP_CPP_GAME_=\
+NODEP_CPP_GLOBA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_GAME_=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\global.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\gob.cpp
+DEP_CPP_GOB_C=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -757,851 +792,755 @@ DEP_CPP_GAME_=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\goblin.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\mult.h"\
-	"..\..\..\gob\pack.h"\
-	"..\..\..\gob\parse.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\anim.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\init.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\map.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\music.h"\
+	"..\..\..\engines\gob\pack.h"\
+	"..\..\..\engines\gob\palanim.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\timer.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_GAME_=\
+NODEP_CPP_GOB_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\game.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\global.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_GLOBA=\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_GLOBA=\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\gob.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_GLOBA=\
+SOURCE=..\..\..\engines\gob\goblin.cpp
+DEP_CPP_GOBLI=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\anim.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\map.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\music.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_GLOBA=\
+NODEP_CPP_GOBLI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_GLOBA=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\goblin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\goblin_v1.cpp
+DEP_CPP_GOBLIN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\map.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_GLOBA=\
+NODEP_CPP_GOBLIN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gob\global.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\gob.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_GOB_C=\
-	"..\..\..\gob\backends\fs\fs.h"\
-	"..\..\..\gob\base\options.h"\
-	"..\..\..\gob\base\plugins.h"\
-	"..\..\..\gob\common\md5.h"\
-	"..\..\..\gob\common\stdafx.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\init.h"\
-	"..\..\..\gob\gob\sound.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-NODEP_CPP_GOB_C=\
-	"..\..\..\gob\backends\fs\fs.h"\
-	"..\..\..\gob\base\options.h"\
-	"..\..\..\gob\base\plugins.h"\
-	"..\..\..\gob\common\md5.h"\
-	"..\..\..\gob\common\stdafx.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\init.h"\
-	"..\..\..\gob\gob\sound.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_GOB_C=\
-	"..\..\..\backends\fs\fs.h"\
+SOURCE=..\..\..\engines\gob\goblin_v2.cpp
+DEP_CPP_GOBLIN_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\init.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\map.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_GOB_C=\
+NODEP_CPP_GOBLIN_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_GOB_C=\
-	"..\..\..\backends\fs\fs.h"\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\init.cpp
+DEP_CPP_INIT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\init.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\init.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\timer.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_GOB_C=\
+NODEP_CPP_INIT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\gob.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\goblin.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_GOBLI=\
-	"..\..\..\gob\gob\anim.h"\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\goblin.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\map.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\sound.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_GOBLI=\
-	"..\..\..\gob\gob\anim.h"\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\goblin.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\map.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\sound.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\init.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_GOBLI=\
+SOURCE=..\..\..\engines\gob\init_v1.cpp
+DEP_CPP_INIT_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\anim.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\goblin.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\map.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_GOBLI=\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\init.h"\
+	"..\..\..\engines\gob\timer.h"\
+	"..\..\..\engines\gob\video.h"\
+	
+NODEP_CPP_INIT_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_GOBLI=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\init_v2.cpp
+DEP_CPP_INIT_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\anim.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\goblin.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\map.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_GOBLI=\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\init.h"\
+	"..\..\..\engines\gob\timer.h"\
+	"..\..\..\engines\gob\video.h"\
+	
+NODEP_CPP_INIT_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gob\goblin.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\init.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_INIT_=\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\init.h"\
-	"..\..\..\gob\gob\sound.h"\
-	"..\..\..\gob\gob\timer.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-NODEP_CPP_INIT_=\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\init.h"\
-	"..\..\..\gob\gob\sound.h"\
-	"..\..\..\gob\gob\timer.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_INIT_=\
+SOURCE=..\..\..\engines\gob\inter.cpp
+DEP_CPP_INTER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\init.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\timer.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\map.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INIT_=\
+NODEP_CPP_INTER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_INIT_=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\inter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\inter_v1.cpp
+DEP_CPP_INTER_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\init.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\timer.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\anim.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\map.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\music.h"\
+	"..\..\..\engines\gob\palanim.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INIT_=\
+NODEP_CPP_INTER_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gob\init.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\inter.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_INTER=\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\goblin.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\mult.h"\
-	"..\..\..\gob\gob\parse.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\util.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-NODEP_CPP_INTER=\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\goblin.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\mult.h"\
-	"..\..\..\gob\gob\parse.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\util.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_INTER=\
+SOURCE=..\..\..\engines\gob\inter_v2.cpp
+DEP_CPP_INTER_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\goblin.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\mult.h"\
-	"..\..\..\gob\parse.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\anim.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\map.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\music.h"\
+	"..\..\..\engines\gob\palanim.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INTER=\
+NODEP_CPP_INTER_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_INTER=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\map.cpp
+DEP_CPP_MAP_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\goblin.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\mult.h"\
-	"..\..\..\gob\parse.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\map.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INTER=\
+NODEP_CPP_MAP_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\inter.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\map.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_MAP_C=\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\goblin.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\map.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\sound.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_MAP_C=\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\goblin.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\map.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\sound.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\map.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_MAP_C=\
+SOURCE=..\..\..\engines\gob\map_v1.cpp
+DEP_CPP_MAP_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\goblin.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\map.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\map.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MAP_C=\
+NODEP_CPP_MAP_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_MAP_C=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\map_v2.cpp
+DEP_CPP_MAP_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\goblin.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\map.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\map.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MAP_C=\
+NODEP_CPP_MAP_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gob\map.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\mult.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_MULT_=\
-	"..\..\..\gob\gob\anim.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\mult.h"\
-	"..\..\..\gob\gob\palanim.h"\
-	"..\..\..\gob\gob\parse.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\sound.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-NODEP_CPP_MULT_=\
-	"..\..\..\gob\gob\anim.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\mult.h"\
-	"..\..\..\gob\gob\palanim.h"\
-	"..\..\..\gob\gob\parse.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\sound.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\..\engines\gob\mult.cpp
 DEP_CPP_MULT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\anim.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\mult.h"\
-	"..\..\..\gob\palanim.h"\
-	"..\..\..\gob\parse.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\anim.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\palanim.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MULT_=\
 	"..\..\..\common\config.h"\
@@ -1610,235 +1549,257 @@ NODEP_CPP_MULT_=\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_MULT_=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\mult.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\mult_v1.cpp
+DEP_CPP_MULT_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\anim.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\mult.h"\
-	"..\..\..\gob\palanim.h"\
-	"..\..\..\gob\parse.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\anim.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\palanim.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MULT_=\
+NODEP_CPP_MULT_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gob\mult.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\pack.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_PACK_=\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\pack.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-NODEP_CPP_PACK_=\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\pack.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_PACK_=\
+SOURCE=..\..\..\engines\gob\mult_v2.cpp
+DEP_CPP_MULT_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\pack.h"\
+	"..\..\..\engines\gob\anim.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\mult.h"\
+	"..\..\..\engines\gob\music.h"\
+	"..\..\..\engines\gob\palanim.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PACK_=\
+NODEP_CPP_MULT_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_PACK_=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\music.cpp
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\pack.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\music.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PACK_=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\pack.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\palanim.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_PALAN=\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\palanim.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_PALAN=\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\palanim.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\music.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_PALAN=\
+SOURCE=..\..\..\engines\gob\pack.cpp
+DEP_CPP_PACK_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\palanim.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\pack.h"\
 	
-NODEP_CPP_PALAN=\
+NODEP_CPP_PACK_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\pack.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\palanim.cpp
 DEP_CPP_PALAN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\palanim.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\palanim.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
 	
 NODEP_CPP_PALAN=\
 	"..\..\..\common\config.h"\
@@ -1847,71 +1808,54 @@ NODEP_CPP_PALAN=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\palanim.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\parse.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_PARSE=\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\parse.h"\
-	"..\..\..\gob\gob\util.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_PARSE=\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\parse.h"\
-	"..\..\..\gob\gob\util.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\palanim.h
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\..\engines\gob\parse.cpp
 DEP_CPP_PARSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\parse.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_PARSE=\
 	"..\..\..\common\config.h"\
@@ -1920,169 +1864,159 @@ NODEP_CPP_PARSE=\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_PARSE=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\parse.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\parse_v1.cpp
+DEP_CPP_PARSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\parse.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PARSE=\
+NODEP_CPP_PARSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gob\parse.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\scenery.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_SCENE=\
-	"..\..\..\gob\gob\anim.h"\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\parse.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-NODEP_CPP_SCENE=\
-	"..\..\..\gob\gob\anim.h"\
-	"..\..\..\gob\gob\cdrom.h"\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\inter.h"\
-	"..\..\..\gob\gob\parse.h"\
-	"..\..\..\gob\gob\scenery.h"\
-	"..\..\..\gob\gob\util.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_SCENE=\
+SOURCE=..\..\..\engines\gob\parse_v2.cpp
+DEP_CPP_PARSE_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\anim.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\parse.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCENE=\
+NODEP_CPP_PARSE_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\scenery.cpp
 DEP_CPP_SCENE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\anim.h"\
-	"..\..\..\gob\cdrom.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\inter.h"\
-	"..\..\..\gob\parse.h"\
-	"..\..\..\gob\scenery.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\cdrom.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\parse.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCENE=\
 	"..\..\..\common\config.h"\
@@ -2091,200 +2025,195 @@ NODEP_CPP_SCENE=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\scenery.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\sound.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\sound.h"\
-	"..\..\..\gob\sound\audiostream.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_SOUND=\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\sound.h"\
-	"..\..\..\gob\sound\audiostream.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\scenery.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_SOUND=\
+SOURCE=..\..\..\engines\gob\scenery_v1.cpp
+DEP_CPP_SCENER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\anim.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\video.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SOUND=\
+NODEP_CPP_SCENER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SOUND=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\scenery_v2.cpp
+DEP_CPP_SCENERY=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\anim.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\scenery.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\video.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SOUND=\
+NODEP_CPP_SCENERY=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gob\sound.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\timer.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_TIMER=\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\sound.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-NODEP_CPP_TIMER=\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\sound.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_TIMER=\
+SOURCE=..\..\..\engines\gob\sound.cpp
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_TIMER=\
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\timer.cpp
 DEP_CPP_TIMER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\timer.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TIMER=\
 	"..\..\..\common\config.h"\
@@ -2293,71 +2222,54 @@ NODEP_CPP_TIMER=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\timer.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\util.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_UTIL_=\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\timer.h"\
-	"..\..\..\gob\gob\util.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_UTIL_=\
-	"..\..\..\gob\gob\draw.h"\
-	"..\..\..\gob\gob\game.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\timer.h"\
-	"..\..\..\gob\gob\util.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\timer.h
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\..\engines\gob\util.cpp
 DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\timer.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\game.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\goblin.h"\
+	"..\..\..\engines\gob\inter.h"\
+	"..\..\..\engines\gob\sound.h"\
+	"..\..\..\engines\gob\timer.h"\
+	"..\..\..\engines\gob\util.h"\
+	"..\..\..\engines\gob\video.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
@@ -2366,160 +2278,162 @@ NODEP_CPP_UTIL_=\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_UTIL_=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\util.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\video.cpp
+DEP_CPP_VIDEO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\draw.h"\
-	"..\..\..\gob\game.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\sound.h"\
-	"..\..\..\gob\timer.h"\
-	"..\..\..\gob\util.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\driver_vga.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\video.h"\
 	
-NODEP_CPP_UTIL_=\
+NODEP_CPP_VIDEO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\gob\util.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\video.cpp
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_VIDEO=\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\driver_vga.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_VIDEO=\
-	"..\..\..\gob\gob\dataio.h"\
-	"..\..\..\gob\gob\driver_vga.h"\
-	"..\..\..\gob\gob\global.h"\
-	"..\..\..\gob\gob\gob.h"\
-	"..\..\..\gob\gob\video.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\gob\video.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_VIDEO=\
+SOURCE=..\..\..\engines\gob\video_v1.cpp
+DEP_CPP_VIDEO_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\driver_vga.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\video.h"\
 	
-NODEP_CPP_VIDEO=\
+NODEP_CPP_VIDEO_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_VIDEO=\
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\gob\video_v2.cpp
+DEP_CPP_VIDEO_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gob\dataio.h"\
-	"..\..\..\gob\driver_vga.h"\
-	"..\..\..\gob\global.h"\
-	"..\..\..\gob\gob.h"\
-	"..\..\..\gob\video.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\gob\dataio.h"\
+	"..\..\..\engines\gob\draw.h"\
+	"..\..\..\engines\gob\global.h"\
+	"..\..\..\engines\gob\gob.h"\
+	"..\..\..\engines\gob\video.h"\
 	
-NODEP_CPP_VIDEO=\
+NODEP_CPP_VIDEO_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
+!IF  "$(CFG)" == "gob - Win32 (WCE emulator) Release"
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\gob\video.h
-# End Source File
-# End Group
-# Begin Group "Header Files"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARMV4) Debug"
 
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
+!ELSEIF  "$(CFG)" == "gob - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/dists/msevc4/kyra/kyra.vcp b/dists/msevc4/kyra/kyra.vcp
new file mode 100644
index 0000000000..f2bf4e9eb2
--- /dev/null
+++ b/dists/msevc4/kyra/kyra.vcp
@@ -0,0 +1,633 @@
+# Microsoft eMbedded Visual Tools Project File - Name="kyra" - Package Owner=<4>
+# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (WCE ARM) Static Library" 0x8504
+
+CFG=kyra - Win32 (WCE ARM) Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "kyra.vcn".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "kyra.vcn" CFG="kyra - Win32 (WCE ARM) Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "kyra - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Static Library")
+!MESSAGE "kyra - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+# PROP ATL_Project 2
+CPP=clarm.exe
+
+!IF  "$(CFG)" == "kyra - Win32 (WCE ARM) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ARMRel"
+# PROP BASE Intermediate_Dir "ARMRel"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ARMRel"
+# PROP Intermediate_Dir "ARMRel"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Target_Dir ""
+# 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 /I "../../../" /I "../../../engines" /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_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /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
+
+!ELSEIF  "$(CFG)" == "kyra - Win32 (WCE ARM) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "ARMDbg"
+# PROP BASE Intermediate_Dir "ARMDbg"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "ARMDbg"
+# PROP Intermediate_Dir "ARMDbg"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Target_Dir ""
+# 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 /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "kyra - Win32 (WCE ARM) Release"
+# Name "kyra - Win32 (WCE ARM) Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\animator.cpp
+DEP_CPP_ANIMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\kyra\animator.h"\
+	"..\..\..\engines\kyra\kyra.h"\
+	"..\..\..\engines\kyra\screen.h"\
+	"..\..\..\engines\kyra\sprites.h"\
+	
+NODEP_CPP_ANIMA=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\animator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\debugger.cpp
+NODEP_CPP_DEBUG=\
+	"..\..\..\engines\kyra\common\config-manager.h"\
+	"..\..\..\engines\kyra\common\debugger.cpp"\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\kyra\debugger.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\debugger.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\gui.cpp
+DEP_CPP_GUI_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\kyra\animator.h"\
+	"..\..\..\engines\kyra\kyra.h"\
+	"..\..\..\engines\kyra\screen.h"\
+	"..\..\..\engines\kyra\script.h"\
+	"..\..\..\engines\kyra\text.h"\
+	
+NODEP_CPP_GUI_C=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\items.cpp
+DEP_CPP_ITEMS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\kyra\animator.h"\
+	"..\..\..\engines\kyra\kyra.h"\
+	"..\..\..\engines\kyra\resource.h"\
+	"..\..\..\engines\kyra\screen.h"\
+	"..\..\..\engines\kyra\seqplayer.h"\
+	"..\..\..\engines\kyra\sound.h"\
+	"..\..\..\engines\kyra\sprites.h"\
+	"..\..\..\engines\kyra\text.h"\
+	"..\..\..\engines\kyra\wsamovie.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_ITEMS=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\kyra.cpp
+DEP_CPP_KYRA_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.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"\
+	"..\..\..\engines\kyra\animator.h"\
+	"..\..\..\engines\kyra\debugger.h"\
+	"..\..\..\engines\kyra\kyra.h"\
+	"..\..\..\engines\kyra\resource.h"\
+	"..\..\..\engines\kyra\screen.h"\
+	"..\..\..\engines\kyra\script.h"\
+	"..\..\..\engines\kyra\seqplayer.h"\
+	"..\..\..\engines\kyra\sound.h"\
+	"..\..\..\engines\kyra\sprites.h"\
+	"..\..\..\engines\kyra\text.h"\
+	"..\..\..\engines\kyra\wsamovie.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_KYRA_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\kyra.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\kyra3.cpp
+DEP_CPP_KYRA3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\kyra\kyra.h"\
+	"..\..\..\engines\kyra\resource.h"\
+	"..\..\..\engines\kyra\screen.h"\
+	"..\..\..\engines\kyra\sound.h"\
+	"..\..\..\engines\kyra\text.h"\
+	"..\..\..\engines\kyra\vqa.h"\
+	"..\..\..\engines\kyra\wsamovie.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_KYRA3=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\plugin.cpp
+NODEP_CPP_PLUGI=\
+	"..\..\..\engines\kyra\backends\fs\fs.h"\
+	"..\..\..\engines\kyra\base\plugins.h"\
+	"..\..\..\engines\kyra\common\config-manager.h"\
+	"..\..\..\engines\kyra\common\file.h"\
+	"..\..\..\engines\kyra\common\md5.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\resource.cpp
+NODEP_CPP_RESOU=\
+	"..\..\..\engines\kyra\common\endian.h"\
+	"..\..\..\engines\kyra\common\file.h"\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\kyra\resource.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	"..\..\..\engines\kyra\kyra\script.h"\
+	"..\..\..\engines\kyra\kyra\wsamovie.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\saveload.cpp
+DEP_CPP_SAVEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\engines\kyra\animator.h"\
+	"..\..\..\engines\kyra\kyra.h"\
+	"..\..\..\engines\kyra\resource.h"\
+	"..\..\..\engines\kyra\screen.h"\
+	
+NODEP_CPP_SAVEL=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\scene.cpp
+NODEP_CPP_SCENE=\
+	"..\..\..\engines\kyra\common\savefile.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\kyra\animator.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\resource.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	"..\..\..\engines\kyra\kyra\script.h"\
+	"..\..\..\engines\kyra\kyra\seqplayer.h"\
+	"..\..\..\engines\kyra\kyra\sound.h"\
+	"..\..\..\engines\kyra\kyra\sprites.h"\
+	"..\..\..\engines\kyra\kyra\text.h"\
+	"..\..\..\engines\kyra\kyra\wsamovie.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\screen.cpp
+NODEP_CPP_SCREE=\
+	"..\..\..\engines\kyra\common\endian.h"\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\graphics\cursorman.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\resource.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\screen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\script.cpp
+NODEP_CPP_SCRIP=\
+	"..\..\..\engines\kyra\common\endian.h"\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\common\stream.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\common\util.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\resource.h"\
+	"..\..\..\engines\kyra\kyra\script.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\script.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\script_v1.cpp
+NODEP_CPP_SCRIPT=\
+	"..\..\..\engines\kyra\common\endian.h"\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\kyra\animator.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	"..\..\..\engines\kyra\kyra\script.h"\
+	"..\..\..\engines\kyra\kyra\sprites.h"\
+	"..\..\..\engines\kyra\kyra\text.h"\
+	"..\..\..\engines\kyra\kyra\wsamovie.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\seqplayer.cpp
+NODEP_CPP_SEQPL=\
+	"..\..\..\engines\kyra\base\engine.h"\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\resource.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	"..\..\..\engines\kyra\kyra\seqplayer.h"\
+	"..\..\..\engines\kyra\kyra\sound.h"\
+	"..\..\..\engines\kyra\kyra\text.h"\
+	"..\..\..\engines\kyra\kyra\wsamovie.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\seqplayer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\sequences_v1.cpp
+NODEP_CPP_SEQUE=\
+	"..\..\..\engines\kyra\common\savefile.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\kyra\animator.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\resource.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	"..\..\..\engines\kyra\kyra\seqplayer.h"\
+	"..\..\..\engines\kyra\kyra\sound.h"\
+	"..\..\..\engines\kyra\kyra\sprites.h"\
+	"..\..\..\engines\kyra\kyra\text.h"\
+	"..\..\..\engines\kyra\kyra\wsamovie.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\sound.cpp
+NODEP_CPP_SOUND=\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\kyra\resource.h"\
+	"..\..\..\engines\kyra\kyra\sound.h"\
+	"..\..\..\engines\kyra\sound\audiostream.h"\
+	"..\..\..\engines\kyra\sound\flac.h"\
+	"..\..\..\engines\kyra\sound\mixer.h"\
+	"..\..\..\engines\kyra\sound\mp3.h"\
+	"..\..\..\engines\kyra\sound\voc.h"\
+	"..\..\..\engines\kyra\sound\vorbis.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\sound_adlib.cpp
+NODEP_CPP_SOUND_=\
+	"..\..\..\engines\kyra\common\mutex.h"\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\common\timer.h"\
+	"..\..\..\engines\kyra\kyra\resource.h"\
+	"..\..\..\engines\kyra\kyra\sound.h"\
+	"..\..\..\engines\kyra\sound\audiostream.h"\
+	"..\..\..\engines\kyra\sound\fmopl.h"\
+	"..\..\..\engines\kyra\sound\mixer.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\sound_digital.cpp
+NODEP_CPP_SOUND_D=\
+	"..\..\..\engines\kyra\kyra\sound.h"\
+	"..\..\..\engines\kyra\sound\audiostream.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\sprites.cpp
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\kyra\common\endian.h"\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\common\stream.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\common\util.h"\
+	"..\..\..\engines\kyra\kyra\animator.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\resource.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	"..\..\..\engines\kyra\kyra\sprites.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\sprites.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\staticres.cpp
+NODEP_CPP_STATI=\
+	"..\..\..\engines\kyra\common\endian.h"\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\resource.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\text.cpp
+NODEP_CPP_TEXT_=\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\kyra\animator.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	"..\..\..\engines\kyra\kyra\sprites.h"\
+	"..\..\..\engines\kyra\kyra\text.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\text.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\timer.cpp
+NODEP_CPP_TIMER=\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\kyra\animator.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\vqa.cpp
+NODEP_CPP_VQA_C=\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\common\system.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	"..\..\..\engines\kyra\kyra\sound.h"\
+	"..\..\..\engines\kyra\kyra\vqa.h"\
+	"..\..\..\engines\kyra\sound\audiostream.h"\
+	"..\..\..\engines\kyra\sound\mixer.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\vqa.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\wsamovie.cpp
+NODEP_CPP_WSAMO=\
+	"..\..\..\engines\kyra\common\endian.h"\
+	"..\..\..\engines\kyra\common\stdafx.h"\
+	"..\..\..\engines\kyra\kyra\kyra.h"\
+	"..\..\..\engines\kyra\kyra\screen.h"\
+	"..\..\..\engines\kyra\kyra\wsamovie.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\kyra\wsamovie.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/dists/msevc4/queen/queen.vcp b/dists/msevc4/queen/queen.vcp
index e1a8128720..0845bcb88f 100644
--- a/dists/msevc4/queen/queen.vcp
+++ b/dists/msevc4/queen/queen.vcp
@@ -55,15 +55,15 @@ CFG=queen - 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)" == "queen - 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)" == "queen - 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/" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "queen - 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 "DISABLE_SWORD1" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /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 "DISABLE_SWORD1" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
 
@@ -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" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /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" /I "../../../engines" /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_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -290,8 +290,8 @@ BSC32=bscmake.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 CPP=shcl.exe
-# 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" /YX /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxs /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" /D "USE_ZLIB" /YX /M$(CECrtMT) /c
+# 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" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -318,51 +318,29 @@ BSC32=bscmake.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\queen\bankman.cpp
+SOURCE=..\..\..\engines\queen\bankman.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_BANKM=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\resource.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_BANKM=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\resource.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_BANKM=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\structs.h"\
 	
 NODEP_CPP_BANKM=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_BANKM=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -376,11 +354,10 @@ DEP_CPP_BANKM=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\structs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\queen\bankman.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\structs.h"\
 	
 NODEP_CPP_BANKM=\
 	"..\..\..\common\config.h"\
@@ -389,64 +366,52 @@ NODEP_CPP_BANKM=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_BANKM=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BANKM=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_BANKM=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\structs.h"\
 	
 NODEP_CPP_BANKM=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_BANKM=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BANKM=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_BANKM=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\structs.h"\
 	
 NODEP_CPP_BANKM=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
 	
 
 !ENDIF 
@@ -454,88 +419,47 @@ NODEP_CPP_BANKM=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\bankman.h
+SOURCE=..\..\..\engines\queen\bankman.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\command.cpp
+SOURCE=..\..\..\engines\queen\command.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_COMMA=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\command.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\queen\state.h"\
-	"..\..\..\queen\queen\walk.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_COMMA=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\command.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\queen\state.h"\
-	"..\..\..\queen\queen\walk.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_COMMA=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_COMMA=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_COMMA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -548,111 +472,109 @@ DEP_CPP_COMMA=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\walk.h"\
+	"..\..\..\engines\queen\command.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\display.h"\
+	"..\..\..\engines\queen\graphics.h"\
+	"..\..\..\engines\queen\grid.h"\
+	"..\..\..\engines\queen\input.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\sound.h"\
+	"..\..\..\engines\queen\state.h"\
+	"..\..\..\engines\queen\structs.h"\
+	"..\..\..\engines\queen\walk.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COMMA=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_COMMA=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_COMMA=\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_COMMA=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_COMMA=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_COMMA=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_COMMA=\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_COMMA=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_COMMA=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
 !ENDIF 
@@ -660,64 +582,40 @@ NODEP_CPP_COMMA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\command.h
+SOURCE=..\..\..\engines\queen\command.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\credits.cpp
+SOURCE=..\..\..\engines\queen\credits.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CREDI=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\credits.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CREDI=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\credits.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_CREDI=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\credits.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
 	
 NODEP_CPP_CREDI=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\credits.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_CREDI=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -729,82 +627,72 @@ DEP_CPP_CREDI=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\credits.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\queen\credits.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\display.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
 	
 NODEP_CPP_CREDI=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_CREDI=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CREDI=\
+	"..\..\..\engines\queen\queen\credits.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_CREDI=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\credits.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
 	
 NODEP_CPP_CREDI=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\credits.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
-
 DEP_CPP_CREDI=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\credits.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
 	
 NODEP_CPP_CREDI=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\credits.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
+
+DEP_CPP_CREDI=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CREDI=\
+	"..\..\..\engines\queen\queen\credits.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
 	
 
 !ENDIF 
@@ -812,52 +700,48 @@ NODEP_CPP_CREDI=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\credits.h
+SOURCE=..\..\..\engines\queen\credits.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\cutaway.cpp
+SOURCE=..\..\..\engines\queen\cutaway.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CUTAW=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\cutaway.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\queen\talk.h"\
-	"..\..\..\queen\queen\walk.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CUTAW=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
 NODEP_CPP_CUTAW=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\cutaway.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\queen\talk.h"\
-	"..\..\..\queen\queen\walk.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_CUTAW=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -870,204 +754,252 @@ DEP_CPP_CUTAW=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
+	"..\..\..\engines\queen\bankman.h"\
+	"..\..\..\engines\queen\cutaway.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\display.h"\
+	"..\..\..\engines\queen\graphics.h"\
+	"..\..\..\engines\queen\grid.h"\
+	"..\..\..\engines\queen\input.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\sound.h"\
+	"..\..\..\engines\queen\structs.h"\
+	"..\..\..\engines\queen\talk.h"\
+	"..\..\..\engines\queen\walk.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_CUTAW=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_CUTAW=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CUTAW=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
+DEP_CPP_CUTAW=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CUTAW=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
+DEP_CPP_CUTAW=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CUTAW=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_CUTAW=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CUTAW=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\queen\cutaway.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\queen\debug.cpp
+
+!IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_CUTAW=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
-DEP_CPP_CUTAW=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
+	"..\..\..\engines\queen\debug.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\graphics.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\sound.h"\
+	"..\..\..\engines\queen\structs.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CUTAW=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\queen\cutaway.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\queen\debug.cpp
-
-!IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
-
-NODEP_CPP_DEBUG=\
-	"..\..\..\queen\common\debugger.cpp"\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\debug.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_DEBUG=\
-	"..\..\..\queen\common\debugger.cpp"\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\debug.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.cpp"\
 	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1085,36 +1017,37 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.cpp"\
 	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1132,43 +1065,37 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.cpp"\
 	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1186,38 +1113,37 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.cpp"\
 	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1235,22 +1161,20 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
 !ENDIF 
@@ -1258,87 +1182,61 @@ NODEP_CPP_DEBUG=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\debug.h
+SOURCE=..\..\..\engines\queen\debug.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\defs.h
+SOURCE=..\..\..\engines\queen\defs.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\display.cpp
+SOURCE=..\..\..\engines\queen\display.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_DISPL=\
-	"..\..\..\queen\arm\macros.h"\
-	"..\..\..\queen\arm\native.h"\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\common\system.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_DISPL=\
-	"..\..\..\queen\arm\macros.h"\
-	"..\..\..\queen\arm\native.h"\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\common\system.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_DISPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\structs.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_DISPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\arm\macros.h"\
-	"..\..\..\queen\arm\native.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_DISPL=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -1349,236 +1247,196 @@ DEP_CPP_DISPL=\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\structs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\display.h"\
+	"..\..\..\engines\queen\input.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\structs.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_DISPL=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\arm\macros.h"\
-	"..\..\..\queen\arm\native.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
-
 DEP_CPP_DISPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\structs.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_DISPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\arm\macros.h"\
-	"..\..\..\queen\arm\native.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DISPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\structs.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_DISPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\arm\macros.h"\
-	"..\..\..\queen\arm\native.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\queen\display.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\queen\graphics.cpp
-
-!IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
-
-NODEP_CPP_GRAPH=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_GRAPH=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
-DEP_CPP_GRAPH=\
+DEP_CPP_DISPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_GRAPH=\
+NODEP_CPP_DISPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
-DEP_CPP_GRAPH=\
+DEP_CPP_DISPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_GRAPH=\
+NODEP_CPP_DISPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\queen\display.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
+SOURCE=..\..\..\engines\queen\graphics.cpp
+
+!IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_GRAPH=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_GRAPH=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -1591,62 +1449,99 @@ DEP_CPP_GRAPH=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
+	"..\..\..\engines\queen\bankman.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\display.h"\
+	"..\..\..\engines\queen\graphics.h"\
+	"..\..\..\engines\queen\grid.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\sound.h"\
+	"..\..\..\engines\queen\structs.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_GRAPH=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_GRAPH=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
+
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_GRAPH=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_GRAPH=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_GRAPH=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_GRAPH=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
 !ENDIF 
@@ -1654,63 +1549,40 @@ NODEP_CPP_GRAPH=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\graphics.h
+SOURCE=..\..\..\engines\queen\graphics.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\grid.cpp
+SOURCE=..\..\..\engines\queen\grid.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_GRID_=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_GRID_=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_GRID_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\structs.h"\
 	
 NODEP_CPP_GRID_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_GRID_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -1720,81 +1592,73 @@ DEP_CPP_GRID_=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\structs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\display.h"\
+	"..\..\..\engines\queen\grid.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\structs.h"\
 	
 NODEP_CPP_GRID_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_GRID_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_GRID_=\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_GRID_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\structs.h"\
 	
 NODEP_CPP_GRID_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_GRID_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_GRID_=\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_GRID_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\structs.h"\
 	
 NODEP_CPP_GRID_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
 	
 
 !ENDIF 
@@ -1802,69 +1666,59 @@ NODEP_CPP_GRID_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\grid.h
+SOURCE=..\..\..\engines\queen\grid.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\input.cpp
+SOURCE=..\..\..\engines\queen\input.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_INPUT=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\common\system.h"\
-	"..\..\..\queen\queen\input.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_INPUT=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\common\system.h"\
-	"..\..\..\queen\queen\input.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_INPUT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\input.h"\
 	
 NODEP_CPP_INPUT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\input.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_INPUT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\input.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\input.h"\
 	
 NODEP_CPP_INPUT=\
 	"..\..\..\common\config.h"\
@@ -1873,60 +1727,96 @@ NODEP_CPP_INPUT=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_INPUT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INPUT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_INPUT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\input.h"\
 	
 NODEP_CPP_INPUT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\input.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_INPUT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INPUT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_INPUT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\input.h"\
 	
 NODEP_CPP_INPUT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\input.h"\
 	
 
 !ENDIF 
@@ -1934,50 +1824,58 @@ NODEP_CPP_INPUT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\input.h
+SOURCE=..\..\..\engines\queen\input.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\journal.cpp
+SOURCE=..\..\..\engines\queen\journal.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_JOURN=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\common\system.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\journal.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\music.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
+DEP_CPP_JOURN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
 NODEP_CPP_JOURN=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\common\system.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\journal.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\music.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\journal.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_JOURN=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -1987,172 +1885,160 @@ DEP_CPP_JOURN=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\journal.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
+	"..\..\..\engines\queen\bankman.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\display.h"\
+	"..\..\..\engines\queen\graphics.h"\
+	"..\..\..\engines\queen\grid.h"\
+	"..\..\..\engines\queen\journal.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\music.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\sound.h"\
+	"..\..\..\engines\queen\structs.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_JOURN=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_JOURN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\journal.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_JOURN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\journal.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
+DEP_CPP_JOURN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_JOURN=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\journal.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
 DEP_CPP_JOURN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\journal.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_JOURN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\journal.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_JOURN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\journal.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_JOURN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\journal.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
 !ENDIF 
@@ -2160,114 +2046,67 @@ NODEP_CPP_JOURN=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\journal.h
+SOURCE=..\..\..\engines\queen\journal.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\logic.cpp
+SOURCE=..\..\..\engines\queen\logic.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_LOGIC=\
-	"..\..\..\queen\common\config-manager.h"\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\command.h"\
-	"..\..\..\queen\queen\credits.h"\
-	"..\..\..\queen\queen\cutaway.h"\
-	"..\..\..\queen\queen\debug.h"\
-	"..\..\..\queen\queen\defs.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\journal.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\queen\state.h"\
-	"..\..\..\queen\queen\talk.h"\
-	"..\..\..\queen\queen\walk.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_LOGIC=\
-	"..\..\..\queen\common\config-manager.h"\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\command.h"\
-	"..\..\..\queen\queen\credits.h"\
-	"..\..\..\queen\queen\cutaway.h"\
-	"..\..\..\queen\queen\debug.h"\
-	"..\..\..\queen\queen\defs.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\journal.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\queen\state.h"\
-	"..\..\..\queen\queen\talk.h"\
-	"..\..\..\queen\queen\walk.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\credits.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\journal.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\credits.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\defs.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\journal.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -2276,7 +2115,8 @@ DEP_CPP_LOGIC=\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
@@ -2284,137 +2124,195 @@ DEP_CPP_LOGIC=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\credits.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\journal.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
+	"..\..\..\engines\queen\bankman.h"\
+	"..\..\..\engines\queen\command.h"\
+	"..\..\..\engines\queen\credits.h"\
+	"..\..\..\engines\queen\cutaway.h"\
+	"..\..\..\engines\queen\debug.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\display.h"\
+	"..\..\..\engines\queen\graphics.h"\
+	"..\..\..\engines\queen\grid.h"\
+	"..\..\..\engines\queen\input.h"\
+	"..\..\..\engines\queen\journal.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\sound.h"\
+	"..\..\..\engines\queen\state.h"\
+	"..\..\..\engines\queen\structs.h"\
+	"..\..\..\engines\queen\talk.h"\
+	"..\..\..\engines\queen\walk.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_LOGIC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\credits.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\defs.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\journal.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\credits.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\journal.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\credits.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\defs.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\journal.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\credits.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\defs.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\journal.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\credits.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\journal.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\credits.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\defs.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\journal.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
 !ENDIF 
@@ -2422,72 +2320,48 @@ NODEP_CPP_LOGIC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\logic.h
+SOURCE=..\..\..\engines\queen\logic.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\music.cpp
+SOURCE=..\..\..\engines\queen\music.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MUSIC=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\music.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\sound\midiparser.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MUSIC=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\music.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\sound\midiparser.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -2501,98 +2375,108 @@ DEP_CPP_MUSIC=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\music.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\sound.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MUSIC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_MUSIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\sound\midiparser.h"\
+	
+NODEP_CPP_MUSIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_MUSIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\sound\midiparser.h"\
+	
+NODEP_CPP_MUSIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
 !ENDIF 
@@ -2600,41 +2484,46 @@ NODEP_CPP_MUSIC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\music.h
+SOURCE=..\..\..\engines\queen\music.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\musicdata.cpp
+SOURCE=..\..\..\engines\queen\musicdata.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MUSICD=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MUSICD=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
 NODEP_CPP_MUSICD=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_MUSICD=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\sound.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\sound.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_MUSICD=\
@@ -2642,168 +2531,193 @@ NODEP_CPP_MUSICD=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_MUSICD=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MUSICD=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
+DEP_CPP_MUSICD=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MUSICD=\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
+
+DEP_CPP_MUSICD=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MUSICD=\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
+
+DEP_CPP_MUSICD=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MUSICD=\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\queen\queen.cpp
+
+!IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MUSICD=\
+DEP_CPP_QUEEN=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.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"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_MUSICD=\
+NODEP_CPP_QUEEN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
-DEP_CPP_MUSICD=\
+DEP_CPP_QUEEN=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.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"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\sound.h"\
+	"..\..\..\engines\queen\bankman.h"\
+	"..\..\..\engines\queen\command.h"\
+	"..\..\..\engines\queen\cutaway.h"\
+	"..\..\..\engines\queen\debug.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\display.h"\
+	"..\..\..\engines\queen\graphics.h"\
+	"..\..\..\engines\queen\grid.h"\
+	"..\..\..\engines\queen\input.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\music.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\sound.h"\
+	"..\..\..\engines\queen\structs.h"\
+	"..\..\..\engines\queen\talk.h"\
+	"..\..\..\engines\queen\walk.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_MUSICD=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_QUEEN=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\queen\queen.cpp
-
-!IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
-
-NODEP_CPP_QUEEN=\
-	"..\..\..\queen\backends\fs\fs.h"\
-	"..\..\..\queen\base\options.h"\
-	"..\..\..\queen\base\plugins.h"\
-	"..\..\..\queen\common\config-manager.h"\
-	"..\..\..\queen\common\file.h"\
-	"..\..\..\queen\common\savefile.h"\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\common\system.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\command.h"\
-	"..\..\..\queen\queen\cutaway.h"\
-	"..\..\..\queen\queen\debug.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\music.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\queen\talk.h"\
-	"..\..\..\queen\queen\walk.h"\
-	"..\..\..\queen\sound\mididrv.h"\
-	
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_QUEEN=\
-	"..\..\..\queen\backends\fs\fs.h"\
-	"..\..\..\queen\base\options.h"\
-	"..\..\..\queen\base\plugins.h"\
-	"..\..\..\queen\common\config-manager.h"\
-	"..\..\..\queen\common\file.h"\
-	"..\..\..\queen\common\savefile.h"\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\common\system.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\command.h"\
-	"..\..\..\queen\queen\cutaway.h"\
-	"..\..\..\queen\queen\debug.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\music.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\queen\talk.h"\
-	"..\..\..\queen\queen\walk.h"\
-	"..\..\..\queen\sound\mididrv.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_QUEEN=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -2815,25 +2729,7 @@ DEP_CPP_QUEEN=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_QUEEN=\
 	"..\..\..\common\config.h"\
@@ -2841,24 +2737,37 @@ NODEP_CPP_QUEEN=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_QUEEN=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -2870,26 +2779,7 @@ DEP_CPP_QUEEN=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_QUEEN=\
 	"..\..\..\common\config.h"\
@@ -2897,30 +2787,37 @@ NODEP_CPP_QUEEN=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
 DEP_CPP_QUEEN=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -2932,25 +2829,7 @@ DEP_CPP_QUEEN=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_QUEEN=\
 	"..\..\..\common\config.h"\
@@ -2958,10 +2837,23 @@ NODEP_CPP_QUEEN=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_QUEEN=\
@@ -2969,15 +2861,13 @@ DEP_CPP_QUEEN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -2989,25 +2879,7 @@ DEP_CPP_QUEEN=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\command.h"\
-	"..\..\..\queen\cutaway.h"\
-	"..\..\..\queen\debug.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_QUEEN=\
 	"..\..\..\common\config.h"\
@@ -3015,6 +2887,21 @@ NODEP_CPP_QUEEN=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\command.h"\
+	"..\..\..\engines\queen\queen\cutaway.h"\
+	"..\..\..\engines\queen\queen\debug.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
 !ENDIF 
@@ -3022,231 +2909,213 @@ NODEP_CPP_QUEEN=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\queen.h
+SOURCE=..\..\..\engines\queen\queen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\resource.cpp
+SOURCE=..\..\..\engines\queen\resource.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_RESOU=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_RESOU=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\resource.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
-
 DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\queen\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\queen\restables.cpp
-
-!IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RESTA=\
-	"..\..\..\queen\queen\resource.h"\
-	
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RESTA=\
-	"..\..\..\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
-DEP_CPP_RESTA=\
+DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
 	
-NODEP_CPP_RESTA=\
+NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
-DEP_CPP_RESTA=\
+DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_RESTA=\
+NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\queen\resource.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
+SOURCE=..\..\..\engines\queen\restables.cpp
+
+!IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
+NODEP_CPP_RESTA=\
+	"..\..\..\engines\queen\queen\resource.h"\
+	
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_RESTA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\resource.h"\
 	
 NODEP_CPP_RESTA=\
 	"..\..\..\common\config.h"\
@@ -3255,30 +3124,28 @@ NODEP_CPP_RESTA=\
 	"..\..\..\common\palmversion.h"\
 	
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
+
+NODEP_CPP_RESTA=\
+	"..\..\..\engines\queen\queen\resource.h"\
+	
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
+
+NODEP_CPP_RESTA=\
+	"..\..\..\engines\queen\queen\resource.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+NODEP_CPP_RESTA=\
+	"..\..\..\engines\queen\queen\resource.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
-DEP_CPP_RESTA=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\resource.h"\
-	
 NODEP_CPP_RESTA=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
 	
 
 !ENDIF 
@@ -3286,40 +3153,47 @@ NODEP_CPP_RESTA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\sound.cpp
+SOURCE=..\..\..\engines\queen\sound.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\music.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\sound\flac.h"\
-	"..\..\..\queen\sound\mp3.h"\
-	"..\..\..\queen\sound\vorbis.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
 NODEP_CPP_SOUND=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\music.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\sound\flac.h"\
-	"..\..\..\queen\sound\mp3.h"\
-	"..\..\..\queen\sound\vorbis.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -3333,12 +3207,12 @@ DEP_CPP_SOUND=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\input.h"\
+	"..\..\..\engines\queen\music.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\sound.h"\
 	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
@@ -3346,83 +3220,47 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\vorbis.h"\
 	
 NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
 	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
 	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
 	
@@ -3430,38 +3268,49 @@ NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\music.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
 	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
 	
@@ -3469,8 +3318,12 @@ NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\music.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
 	
 
 !ENDIF 
@@ -3478,59 +3331,44 @@ NODEP_CPP_SOUND=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\sound.h
+SOURCE=..\..\..\engines\queen\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\state.cpp
+SOURCE=..\..\..\engines\queen\state.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_STATE=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\state.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_STATE=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\state.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_STATE=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\state.h"\
 	
 NODEP_CPP_STATE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\state.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_STATE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\state.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\state.h"\
 	
 NODEP_CPP_STATE=\
 	"..\..\..\common\config.h"\
@@ -3539,52 +3377,48 @@ NODEP_CPP_STATE=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_STATE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_STATE=\
+	"..\..\..\engines\queen\queen\state.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_STATE=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\state.h"\
 	
 NODEP_CPP_STATE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\state.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_STATE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_STATE=\
+	"..\..\..\engines\queen\queen\state.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_STATE=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\state.h"\
 	
 NODEP_CPP_STATE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\state.h"\
 	
 
 !ENDIF 
@@ -3592,100 +3426,63 @@ NODEP_CPP_STATE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\state.h
+SOURCE=..\..\..\engines\queen\state.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\structs.h
+SOURCE=..\..\..\engines\queen\structs.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\talk.cpp
+SOURCE=..\..\..\engines\queen\talk.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_TALK_=\
-	"..\..\..\queen\common\file.h"\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\queen\state.h"\
-	"..\..\..\queen\queen\talk.h"\
-	"..\..\..\queen\queen\walk.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_TALK_=\
-	"..\..\..\queen\common\file.h"\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\display.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\resource.h"\
-	"..\..\..\queen\queen\sound.h"\
-	"..\..\..\queen\queen\state.h"\
-	"..\..\..\queen\queen\talk.h"\
-	"..\..\..\queen\queen\walk.h"\
-	"..\..\..\queen\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_TALK_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_TALK_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_TALK_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -3698,117 +3495,159 @@ DEP_CPP_TALK_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
+	"..\..\..\engines\queen\bankman.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\display.h"\
+	"..\..\..\engines\queen\graphics.h"\
+	"..\..\..\engines\queen\grid.h"\
+	"..\..\..\engines\queen\input.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\resource.h"\
+	"..\..\..\engines\queen\sound.h"\
+	"..\..\..\engines\queen\state.h"\
+	"..\..\..\engines\queen\structs.h"\
+	"..\..\..\engines\queen\talk.h"\
+	"..\..\..\engines\queen\walk.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TALK_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_TALK_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_TALK_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_TALK_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_TALK_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_TALK_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_TALK_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_TALK_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\display.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\resource.h"\
-	"..\..\..\queen\sound.h"\
-	"..\..\..\queen\state.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\talk.h"\
-	"..\..\..\queen\walk.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_TALK_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\queen\scumm_globals.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\display.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\resource.h"\
+	"..\..\..\engines\queen\queen\sound.h"\
+	"..\..\..\engines\queen\queen\state.h"\
+	"..\..\..\engines\queen\queen\talk.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	"..\..\..\engines\queen\scumm_globals.h"\
 	
 
 !ENDIF 
@@ -3816,72 +3655,43 @@ NODEP_CPP_TALK_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\talk.h
+SOURCE=..\..\..\engines\queen\talk.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\walk.cpp
+SOURCE=..\..\..\engines\queen\walk.cpp
 
 !IF  "$(CFG)" == "queen - Win32 (WCE emulator) Release"
 
-NODEP_CPP_WALK_=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\walk.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_WALK_=\
-	"..\..\..\queen\common\stdafx.h"\
-	"..\..\..\queen\queen\bankman.h"\
-	"..\..\..\queen\queen\graphics.h"\
-	"..\..\..\queen\queen\grid.h"\
-	"..\..\..\queen\queen\input.h"\
-	"..\..\..\queen\queen\logic.h"\
-	"..\..\..\queen\queen\queen.h"\
-	"..\..\..\queen\queen\walk.h"\
-	
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
+
 DEP_CPP_WALK_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\walk.h"\
 	
 NODEP_CPP_WALK_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
 
 DEP_CPP_WALK_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -3891,90 +3701,88 @@ DEP_CPP_WALK_=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\walk.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\queen\bankman.h"\
+	"..\..\..\engines\queen\defs.h"\
+	"..\..\..\engines\queen\graphics.h"\
+	"..\..\..\engines\queen\grid.h"\
+	"..\..\..\engines\queen\input.h"\
+	"..\..\..\engines\queen\logic.h"\
+	"..\..\..\engines\queen\queen.h"\
+	"..\..\..\engines\queen\structs.h"\
+	"..\..\..\engines\queen\walk.h"\
 	
 NODEP_CPP_WALK_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "queen - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_WALK_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_WALK_=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Debug"
 
 DEP_CPP_WALK_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\walk.h"\
 	
 NODEP_CPP_WALK_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE MIPS) Release"
 
+DEP_CPP_WALK_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_WALK_=\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
+	
+
 !ELSEIF  "$(CFG)" == "queen - Win32 (WCE SH3) Release"
 
 DEP_CPP_WALK_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\queen\bankman.h"\
-	"..\..\..\queen\defs.h"\
-	"..\..\..\queen\graphics.h"\
-	"..\..\..\queen\grid.h"\
-	"..\..\..\queen\input.h"\
-	"..\..\..\queen\logic.h"\
-	"..\..\..\queen\queen.h"\
-	"..\..\..\queen\structs.h"\
-	"..\..\..\queen\walk.h"\
 	
 NODEP_CPP_WALK_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\queen\queen\bankman.h"\
+	"..\..\..\engines\queen\queen\graphics.h"\
+	"..\..\..\engines\queen\queen\grid.h"\
+	"..\..\..\engines\queen\queen\input.h"\
+	"..\..\..\engines\queen\queen\logic.h"\
+	"..\..\..\engines\queen\queen\queen.h"\
+	"..\..\..\engines\queen\queen\walk.h"\
 	
 
 !ENDIF 
@@ -3982,12 +3790,8 @@ NODEP_CPP_WALK_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\queen\walk.h
+SOURCE=..\..\..\engines\queen\walk.h
 # End Source File
 # End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
 # End Target
 # End Project
diff --git a/dists/msevc4/saga/saga.vcp b/dists/msevc4/saga/saga.vcp
index 2f0d2ad58b..070e0b9658 100644
--- a/dists/msevc4/saga/saga.vcp
+++ b/dists/msevc4/saga/saga.vcp
@@ -2,6 +2,7 @@
 # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
 # ** DO NOT EDIT **
 
+# TARGTYPE "Win32 (WCE ARM) Static Library" 0x8504
 # TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304
 # TARGTYPE "Win32 (WCE emulator) Static Library" 0xa604
 
@@ -22,6 +23,7 @@ CFG=saga - Win32 (WCE emulator) Debug
 !MESSAGE "saga - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Static Library")
 !MESSAGE "saga - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library")
 !MESSAGE "saga - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library")
+!MESSAGE "saga - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -47,8 +49,8 @@ CFG=saga - Win32 (WCE emulator) Debug
 # 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
+# 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
@@ -73,8 +75,8 @@ BSC32=bscmake.exe
 # 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
+# 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
@@ -99,8 +101,8 @@ BSC32=bscmake.exe
 # 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/" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT)  /c
+# 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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -125,8 +127,34 @@ BSC32=bscmake.exe
 # 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 "DISABLE_SWORD1" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug)  /c
+# 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 "DISABLE_SWORD1" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /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
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ARMRel"
+# PROP BASE Intermediate_Dir "ARMRel"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ARMRel"
+# PROP Intermediate_Dir "ARMRel"
+# 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" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../../" /I "../../../engines" /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_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -142,80 +170,28 @@ BSC32=bscmake.exe
 # Name "saga - Win32 (WCE emulator) Debug"
 # Name "saga - Win32 (WCE ARMV4) Release"
 # Name "saga - Win32 (WCE ARMV4) Debug"
+# Name "saga - Win32 (WCE ARM) Release"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\saga\actor.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ACTOR=\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\saga\sprite.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ACTOR=\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\saga\sprite.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
+SOURCE=..\..\..\engines\saga\actor.cpp
 DEP_CPP_ACTOR=\
-	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -225,143 +201,63 @@ DEP_CPP_ACTOR=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\animation.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\isomap.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\objectmap.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sndres.h"\
+	"..\..\..\engines\saga\sound.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ACTOR=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_ACTOR=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_ACTOR=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\actor.h
+SOURCE=..\..\..\engines\saga\actor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\animation.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ANIMA=\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ANIMA=\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
+SOURCE=..\..\..\engines\saga\animation.cpp
 DEP_CPP_ANIMA=\
-	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
@@ -370,135 +266,71 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\animation.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\render.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_ANIMA=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_ANIMA=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\animation.h
+SOURCE=..\..\..\engines\saga\animation.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\console.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_CONSO=\
-	"..\..\..\saga\common\debugger.cpp"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_CONSO=\
-	"..\..\..\saga\common\debugger.cpp"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
+SOURCE=..\..\..\engines\saga\console.cpp
 DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.cpp"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -511,6 +343,20 @@ DEP_CPP_CONSO=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\animation.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
@@ -518,141 +364,45 @@ DEP_CPP_CONSO=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONSO=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_CONSO=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_CONSO=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\console.h
+SOURCE=..\..\..\engines\saga\console.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\events.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_EVENT=\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\palanim.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_EVENT=\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\palanim.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
+SOURCE=..\..\..\engines\saga\events.cpp
 DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -664,471 +414,465 @@ DEP_CPP_EVENT=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\animation.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\music.h"\
+	"..\..\..\engines\saga\palanim.h"\
+	"..\..\..\engines\saga\render.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sndres.h"\
+	"..\..\..\engines\saga\sound.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\palanim.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_EVENT=\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\events.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\font.cpp
+DEP_CPP_FONT_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\palanim.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_FONT_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\saga\events.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\saga\font.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_FONT_=\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_FONT_=\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\saga\font.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_FONT_=\
-	"..\..\..\backends\fs\fs.h"\
+SOURCE=..\..\..\engines\saga\font_map.cpp
+DEP_CPP_FONT_M=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_FONT_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_FONT_M=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-DEP_CPP_FONT_=\
-	"..\..\..\backends\fs\fs.h"\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\game.cpp
+DEP_CPP_GAME_=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.cpp"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_FONT_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_GAME_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\font.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\saga\font_map.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_FONT_M=\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\saga.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-NODEP_CPP_FONT_M=\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\saga.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_FONT_M=\
+SOURCE=..\..\..\engines\saga\gfx.cpp
+DEP_CPP_GFX_C=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
+	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\saga.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_FONT_M=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_GFX_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_FONT_M=\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\gfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\ihnm_introproc.cpp
+DEP_CPP_IHNM_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\animation.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\music.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sndres.h"\
+	"..\..\..\engines\saga\sound.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\saga.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_FONT_M=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_IHNM_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\saga\game.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_GAME_=\
-	"..\..\..\saga\backends\fs\fs.h"\
-	"..\..\..\saga\base\options.h"\
-	"..\..\..\saga\base\plugins.h"\
-	"..\..\..\saga\common\file.h"\
-	"..\..\..\saga\common\map.h"\
-	"..\..\..\saga\common\md5.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-NODEP_CPP_GAME_=\
-	"..\..\..\saga\backends\fs\fs.h"\
-	"..\..\..\saga\base\options.h"\
-	"..\..\..\saga\base\plugins.h"\
-	"..\..\..\saga\common\file.h"\
-	"..\..\..\saga\common\map.h"\
-	"..\..\..\saga\common\md5.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_GAME_=\
-	"..\..\..\backends\fs\fs.h"\
+SOURCE=..\..\..\engines\saga\image.cpp
+DEP_CPP_IMAGE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\md5.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_GAME_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_IMAGE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_GAME_=\
-	"..\..\..\backends\fs\fs.h"\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\input.cpp
+DEP_CPP_INPUT=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\md5.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\isomap.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\render.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_GAME_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_INPUT=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\saga\gfx.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_GFX_C=\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-NODEP_CPP_GFX_C=\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_GFX_C=\
-	"..\..\..\backends\fs\fs.h"\
+SOURCE=..\..\..\engines\saga\interface.cpp
+DEP_CPP_INTER=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -1139,123 +883,129 @@ DEP_CPP_GFX_C=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\isomap.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\music.h"\
+	"..\..\..\engines\saga\objectmap.h"\
+	"..\..\..\engines\saga\puzzle.h"\
+	"..\..\..\engines\saga\render.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sound.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GFX_C=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_INTER=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_GFX_C=\
-	"..\..\..\backends\fs\fs.h"\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\interface.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\isomap.cpp
+DEP_CPP_ISOMA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\isomap.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_GFX_C=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ISOMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\saga\gfx.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\saga\ihnm_introproc.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_IHNM_=\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_IHNM_=\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\saga\isomap.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_IHNM_=\
+SOURCE=..\..\..\engines\saga\ite_introproc.cpp
+DEP_CPP_ITE_I=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -1270,2196 +1020,426 @@ DEP_CPP_IHNM_=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\animation.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\music.h"\
+	"..\..\..\engines\saga\palanim.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sndres.h"\
+	"..\..\..\engines\saga\sound.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_IHNM_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ITE_I=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_IHNM_=\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\itedata.cpp
+DEP_CPP_ITEDA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\sndres.h"\
+	"..\..\..\engines\saga\sound.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_IHNM_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ITEDA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\image.cpp
+SOURCE=..\..\..\engines\saga\itedata.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\saga\list.h
+# End Source File
+# Begin Source File
 
-NODEP_CPP_IMAGE=\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_IMAGE=\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_IMAGE=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_IMAGE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_IMAGE=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_IMAGE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\input.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_INPUT=\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_INPUT=\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_INPUT=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_INPUT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_INPUT=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_INPUT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\interface.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_INTER=\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\common\timer.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\saga\sprite.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_INTER=\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\common\timer.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\saga\sprite.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_INTER=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_INTER=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_INTER=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_INTER=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\interface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\isomap.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ISOMA=\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ISOMA=\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_ISOMA=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_ISOMA=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_ISOMA=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_ISOMA=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\isomap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\ite_introproc.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ITE_I=\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\palanim.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ITE_I=\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\palanim.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_ITE_I=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\palanim.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_ITE_I=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_ITE_I=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\palanim.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_ITE_I=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\itedata.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ITEDA=\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ITEDA=\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_ITEDA=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_ITEDA=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_ITEDA=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_ITEDA=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\itedata.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\list.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\music.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MUSIC=\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\common\file.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\stream.h"\
-	"..\..\..\saga\sound\audiostream.h"\
-	"..\..\..\saga\sound\flac.h"\
-	"..\..\..\saga\sound\mididrv.h"\
-	"..\..\..\saga\sound\midiparser.h"\
-	"..\..\..\saga\sound\mp3.h"\
-	"..\..\..\saga\sound\vorbis.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MUSIC=\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\common\file.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\stream.h"\
-	"..\..\..\saga\sound\audiostream.h"\
-	"..\..\..\saga\sound\flac.h"\
-	"..\..\..\saga\sound\mididrv.h"\
-	"..\..\..\saga\sound\midiparser.h"\
-	"..\..\..\saga\sound\mp3.h"\
-	"..\..\..\saga\sound\vorbis.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_MUSIC=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_MUSIC=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_MUSIC=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_MUSIC=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\music.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\objectmap.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_OBJEC=\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_OBJEC=\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_OBJEC=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_OBJEC=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_OBJEC=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_OBJEC=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\objectmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\palanim.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PALAN=\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\palanim.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_PALAN=\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\palanim.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_PALAN=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\palanim.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_PALAN=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_PALAN=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\palanim.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_PALAN=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\palanim.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\puzzle.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PUZZL=\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\common\timer.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sprite.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_PUZZL=\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\common\timer.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sprite.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_PUZZL=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_PUZZL=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_PUZZL=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_PUZZL=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\puzzle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\render.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RENDE=\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\common\timer.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RENDE=\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\common\timer.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_RENDE=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_RENDE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_RENDE=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_RENDE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\render.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\resnames.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\rscfile.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RSCFI=\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RSCFI=\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_RSCFI=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_RSCFI=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_RSCFI=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_RSCFI=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\rscfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\saga.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SAGA_=\
-	"..\..\..\saga\backends\fs\fs.h"\
-	"..\..\..\saga\base\options.h"\
-	"..\..\..\saga\base\plugins.h"\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\common\file.h"\
-	"..\..\..\saga\common\stdafx.h"\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\palanim.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\saga\sprite.h"\
-	"..\..\..\saga\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SAGA_=\
-	"..\..\..\saga\backends\fs\fs.h"\
-	"..\..\..\saga\base\options.h"\
-	"..\..\..\saga\base\plugins.h"\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\common\file.h"\
-	"..\..\..\saga\common\stdafx.h"\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\palanim.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\saga\sprite.h"\
-	"..\..\..\saga\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_SAGA_=\
-	"..\..\..\backends\fs\fs.h"\
+SOURCE=..\..\..\engines\saga\music.cpp
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\music.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\palanim.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
 	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_SAGA_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SAGA_=\
-	"..\..\..\backends\fs\fs.h"\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\music.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\objectmap.cpp
+DEP_CPP_OBJEC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.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"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\isomap.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\objectmap.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\palanim.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SAGA_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_OBJEC=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\saga\saga.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\saga\saveload.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_SAVEL=\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\common\file.h"\
-	"..\..\..\saga\common\savefile.h"\
-	"..\..\..\saga\common\stdafx.h"\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_SAVEL=\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\common\file.h"\
-	"..\..\..\saga\common\savefile.h"\
-	"..\..\..\saga\common\stdafx.h"\
-	"..\..\..\saga\common\system.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\saga\objectmap.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_SAVEL=\
+SOURCE=..\..\..\engines\saga\palanim.cpp
+DEP_CPP_PALAN=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\palanim.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SAVEL=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_PALAN=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SAVEL=\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\palanim.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\puzzle.cpp
+DEP_CPP_PUZZL=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.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"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\puzzle.h"\
+	"..\..\..\engines\saga\render.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SAVEL=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_PUZZL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\saga\scene.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_SCENE=\
-	"..\..\..\saga\common\util.h"\
-	"..\..\..\saga\graphics\ilbm.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\palanim.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_SCENE=\
-	"..\..\..\saga\common\util.h"\
-	"..\..\..\saga\graphics\ilbm.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\palanim.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\saga\puzzle.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_SCENE=\
-	"..\..\..\backends\fs\fs.h"\
+SOURCE=..\..\..\engines\saga\render.cpp
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.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"\
-	"..\..\..\graphics\ilbm.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\objectmap.h"\
+	"..\..\..\engines\saga\puzzle.h"\
+	"..\..\..\engines\saga\render.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\palanim.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCENE=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SCENE=\
-	"..\..\..\backends\fs\fs.h"\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\render.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\rscfile.cpp
+DEP_CPP_RSCFI=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
@@ -3473,107 +1453,72 @@ DEP_CPP_SCENE=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\ilbm.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\animation.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\music.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sndres.h"\
+	"..\..\..\engines\saga\sound.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\palanim.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCENE=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_RSCFI=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\saga\scene.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\saga\script.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_SCRIP=\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_SCRIP=\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\saga\rscfile.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_SCRIP=\
-	"..\..\..\backends\fs\fs.h"\
+SOURCE=..\..\..\engines\saga\saga.cpp
+DEP_CPP_SAGA_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -3581,159 +1526,85 @@ DEP_CPP_SCRIP=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\animation.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\isomap.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\music.h"\
+	"..\..\..\engines\saga\objectmap.h"\
+	"..\..\..\engines\saga\palanim.h"\
+	"..\..\..\engines\saga\puzzle.h"\
+	"..\..\..\engines\saga\render.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sndres.h"\
+	"..\..\..\engines\saga\sound.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIP=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SAGA_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SCRIP=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_SCRIP=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\script.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\sfuncs.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SFUNC=\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	"..\..\..\saga\saga\sound.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SFUNC=\
-	"..\..\..\saga\common\config-manager.h"\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\animation.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\events.h"\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\isomap.h"\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\music.h"\
-	"..\..\..\saga\saga\objectmap.h"\
-	"..\..\..\saga\saga\puzzle.h"\
-	"..\..\..\saga\saga\render.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	"..\..\..\saga\saga\sound.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\saga\saga.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_SFUNC=\
+SOURCE=..\..\..\engines\saga\sagaresnames.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\saveload.cpp
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -3742,61 +1613,66 @@ DEP_CPP_SFUNC=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\isomap.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\music.h"\
+	"..\..\..\engines\saga\render.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SFUNC=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SFUNC=\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\scene.cpp
+DEP_CPP_SCENE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -3807,326 +1683,323 @@ DEP_CPP_SFUNC=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\animation.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\isomap.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\music.h"\
+	"..\..\..\engines\saga\objectmap.h"\
+	"..\..\..\engines\saga\palanim.h"\
+	"..\..\..\engines\saga\puzzle.h"\
+	"..\..\..\engines\saga\render.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sound.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
+	"..\..\..\graphics\ilbm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\animation.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\events.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\isomap.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\music.h"\
-	"..\..\..\saga\objectmap.h"\
-	"..\..\..\saga\puzzle.h"\
-	"..\..\..\saga\render.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SFUNC=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SCENE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\saga\sndres.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_SNDRE=\
-	"..\..\..\saga\common\file.h"\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\saga\stream.h"\
-	"..\..\..\saga\sound\adpcm.h"\
-	"..\..\..\saga\sound\audiostream.h"\
-	"..\..\..\saga\sound\voc.h"\
-	"..\..\..\saga\sound\wave.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_SNDRE=\
-	"..\..\..\saga\common\file.h"\
-	"..\..\..\saga\saga\itedata.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\sndres.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\saga\stream.h"\
-	"..\..\..\saga\sound\adpcm.h"\
-	"..\..\..\saga\sound\audiostream.h"\
-	"..\..\..\saga\sound\voc.h"\
-	"..\..\..\saga\sound\wave.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\saga\scene.h
+# End Source File
+# Begin Source File
 
-DEP_CPP_SNDRE=\
-	"..\..\..\backends\fs\fs.h"\
+SOURCE=..\..\..\engines\saga\script.cpp
+DEP_CPP_SCRIP=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\isomap.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\objectmap.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\adpcm.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
-	"..\..\..\sound\wave.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SNDRE=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SCRIP=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SNDRE=\
-	"..\..\..\backends\fs\fs.h"\
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\script.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\sfuncs.cpp
+DEP_CPP_SFUNC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\animation.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\events.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\isomap.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\music.h"\
+	"..\..\..\engines\saga\objectmap.h"\
+	"..\..\..\engines\saga\puzzle.h"\
+	"..\..\..\engines\saga\render.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sndres.h"\
+	"..\..\..\engines\saga\sound.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\sndres.h"\
-	"..\..\..\saga\sound.h"\
-	"..\..\..\saga\stream.h"\
-	"..\..\..\sound\adpcm.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
-	"..\..\..\sound\wave.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SNDRE=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SFUNC=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\saga\sndres.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\saga\sound.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\sound\adpcm.h"\
-	"..\..\..\saga\sound\audiostream.h"\
-	"..\..\..\saga\sound\mixer.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\sound.h"\
-	"..\..\..\saga\sound\adpcm.h"\
-	"..\..\..\saga\sound\audiostream.h"\
-	"..\..\..\saga\sound\mixer.h"\
-	
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+# End Source File
+# Begin Source File
 
-DEP_CPP_SOUND=\
+SOURCE=..\..\..\engines\saga\sndres.cpp
+DEP_CPP_SNDRE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\sndres.h"\
+	"..\..\..\engines\saga\sound.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\sound.h"\
 	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SNDRE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\sndres.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\saga\sound.cpp
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sound.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\sound.h"\
 	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\saga\sound.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
 
-SOURCE=..\..\..\saga\sprite.cpp
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
 
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-NODEP_CPP_SPRIT=\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sprite.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+!ENDIF 
 
-NODEP_CPP_SPRIT=\
-	"..\..\..\saga\saga\font.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\rscfile.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\sprite.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+SOURCE=..\..\..\engines\saga\sound.h
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\..\engines\saga\sprite.cpp
 DEP_CPP_SPRIT=\
-	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -4134,213 +2007,109 @@ DEP_CPP_SPRIT=\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\rscfile.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SPRIT=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\rscfile.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\sprite.h
+SOURCE=..\..\..\engines\saga\sprite.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\sthread.cpp
-
-!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
-
-NODEP_CPP_STHRE=\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_STHRE=\
-	"..\..\..\saga\saga\actor.h"\
-	"..\..\..\saga\saga\console.h"\
-	"..\..\..\saga\saga\gfx.h"\
-	"..\..\..\saga\saga\interface.h"\
-	"..\..\..\saga\saga\resnames.h"\
-	"..\..\..\saga\saga\saga.h"\
-	"..\..\..\saga\saga\scene.h"\
-	"..\..\..\saga\saga\script.h"\
-	"..\..\..\saga\saga\stream.h"\
-	
-
-!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
-
+SOURCE=..\..\..\engines\saga\sthread.cpp
 DEP_CPP_STHRE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\saga\actor.h"\
+	"..\..\..\engines\saga\console.h"\
+	"..\..\..\engines\saga\font.h"\
+	"..\..\..\engines\saga\gfx.h"\
+	"..\..\..\engines\saga\interface.h"\
+	"..\..\..\engines\saga\itedata.h"\
+	"..\..\..\engines\saga\list.h"\
+	"..\..\..\engines\saga\saga.h"\
+	"..\..\..\engines\saga\sagagame.h"\
+	"..\..\..\engines\saga\sagaresnames.h"\
+	"..\..\..\engines\saga\scene.h"\
+	"..\..\..\engines\saga\script.h"\
+	"..\..\..\engines\saga\sprite.h"\
+	"..\..\..\engines\saga\stream.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STHRE=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!IF  "$(CFG)" == "saga - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_STHRE=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\saga\actor.h"\
-	"..\..\..\saga\console.h"\
-	"..\..\..\saga\font.h"\
-	"..\..\..\saga\gfx.h"\
-	"..\..\..\saga\interface.h"\
-	"..\..\..\saga\itedata.h"\
-	"..\..\..\saga\list.h"\
-	"..\..\..\saga\resnames.h"\
-	"..\..\..\saga\saga.h"\
-	"..\..\..\saga\scene.h"\
-	"..\..\..\saga\script.h"\
-	"..\..\..\saga\sprite.h"\
-	"..\..\..\saga\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_STHRE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
+!ELSEIF  "$(CFG)" == "saga - Win32 (WCE ARM) Release"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\saga\stream.h
+SOURCE=..\..\..\engines\saga\stream.h
 # End Source File
 # End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
 # End Target
 # End Project
diff --git a/dists/msevc4/scumm/scumm.vcp b/dists/msevc4/scumm/scumm.vcp
index 8ba6b0ee51..b4e96b6cc9 100644
--- a/dists/msevc4/scumm/scumm.vcp
+++ b/dists/msevc4/scumm/scumm.vcp
@@ -55,15 +55,15 @@ CFG=scumm - 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)" == "scumm - 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)" == "scumm - 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/" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "scumm - 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 "DISABLE_SWORD1" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /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 "DISABLE_SWORD1" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
@@ -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" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /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" /I "../../../engines" /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_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -290,8 +290,8 @@ BSC32=bscmake.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 CPP=shcl.exe
-# 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" /YX /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxs /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" /D "USE_ZLIB" /YX /M$(CECrtMT) /c
+# 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" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -316,73 +316,46 @@ BSC32=bscmake.exe
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "smush"
+# Begin Group "he"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\channel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\chunk.cpp
+SOURCE=..\..\..\engines\scumm\he\animation_he.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CHUNK=\
-	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\common\str.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CHUNK=\
-	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\common\str.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_CHUNK=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CHUNK=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -390,93 +363,120 @@ DEP_CPP_CHUNK=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_ANIMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ANIMA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_ANIMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ANIMA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CHUNK=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CHUNK=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
 	
 
 !ENDIF 
@@ -484,106 +484,126 @@ NODEP_CPP_CHUNK=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\chunk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\chunk_type.h
+SOURCE=..\..\..\engines\scumm\he\animation_he.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\codec1.cpp
+SOURCE=..\..\..\engines\scumm\he\floodfill_he.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CODEC=\
-	"..\..\..\scumm\smush\common\scummsys.h"\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CODEC=\
-	"..\..\..\scumm\smush\common\scummsys.h"\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_CODEC=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_FLOOD=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	
-NODEP_CPP_CODEC=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+NODEP_CPP_FLOOD=\
+	"..\..\..\engines\scumm\he\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CODEC=\
+DEP_CPP_FLOOD=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_CODEC=\
+NODEP_CPP_FLOOD=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_FLOOD=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_FLOOD=\
+	"..\..\..\engines\scumm\he\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_FLOOD=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_FLOOD=\
+	"..\..\..\engines\scumm\he\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CODEC=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_FLOOD=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	
-NODEP_CPP_CODEC=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_FLOOD=\
+	"..\..\..\engines\scumm\he\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CODEC=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_FLOOD=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	
-NODEP_CPP_CODEC=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_FLOOD=\
+	"..\..\..\engines\scumm\he\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
 !ENDIF 
@@ -591,114 +611,120 @@ NODEP_CPP_CODEC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\codec37.cpp
+SOURCE=..\..\..\engines\scumm\he\floodfill_he.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\scumm\he\intern_he.h
+# End Source File
+# Begin Source File
 
-NODEP_CPP_CODEC3=\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\bomp.h"\
-	"..\..\..\scumm\smush\scumm\smush\codec37.h"\
-	
+SOURCE=..\..\..\engines\scumm\he\logic_he.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CODEC3=\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\bomp.h"\
-	"..\..\..\scumm\smush\scumm\smush\codec37.h"\
-	
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_CODEC3=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_LOGIC=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\smush\codec37.h"\
 	
-NODEP_CPP_CODEC3=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\logic_he.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CODEC3=\
+DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_CODEC3=\
+NODEP_CPP_LOGIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CODEC3=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_LOGIC=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\smush\codec37.h"\
 	
-NODEP_CPP_CODEC3=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\logic_he.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\logic_he.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\logic_he.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CODEC3=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_LOGIC=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\smush\codec37.h"\
 	
-NODEP_CPP_CODEC3=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\logic_he.h"\
 	
 
 !ENDIF 
@@ -706,266 +732,241 @@ NODEP_CPP_CODEC3=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\codec37.h
+SOURCE=..\..\..\engines\scumm\he\logic_he.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\codec47.cpp
+SOURCE=..\..\..\engines\scumm\he\palette_he.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CODEC4=\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\bomp.h"\
-	"..\..\..\scumm\smush\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CODEC4=\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\bomp.h"\
-	"..\..\..\scumm\smush\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_CODEC4=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\smush\codec47.h"\
 	
-NODEP_CPP_CODEC4=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\smush\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CODEC4=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_CODEC4=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\smush\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CODEC4=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\smush\codec47.h"\
 	
-NODEP_CPP_CODEC4=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\smush\scumm_globals.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CODEC4=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\smush\codec47.h"\
 	
-NODEP_CPP_CODEC4=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\smush\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\codec47.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\imuse_channel.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_IMUSE=\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk_type.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_IMUSE=\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_IMUSE=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_IMUSE=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\he\resource_he.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_IMUSE=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_IMUSE=\
+DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -973,165 +974,176 @@ DEP_CPP_IMUSE=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\graphics\paletteman.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\saud_channel.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SAUD_=\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk_type.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SAUD_=\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk_type.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_RESOU=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_RESOU=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
 !ENDIF 
@@ -1139,63 +1151,55 @@ NODEP_CPP_SAUD_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\smush_font.cpp
+SOURCE=..\..\..\engines\scumm\he\resource_he.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\he\script_v100he.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SMUSH=\
-	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SMUSH=\
-	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SMUSH=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_SMUSH=\
+NODEP_CPP_SCRIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SMUSH=\
+DEP_CPP_SCRIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -1203,96 +1207,172 @@ DEP_CPP_SMUSH=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SMUSH=\
+NODEP_CPP_SCRIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SCRIP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_SCRIP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SCRIP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_SCRIP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SMUSH=\
+DEP_CPP_SCRIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_SMUSH=\
+NODEP_CPP_SCRIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SMUSH=\
+DEP_CPP_SCRIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_SMUSH=\
+NODEP_CPP_SCRIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
 !ENDIF 
@@ -1300,78 +1380,48 @@ NODEP_CPP_SMUSH=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\smush_font.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\smush_mixer.cpp
+SOURCE=..\..\..\engines\scumm\he\script_v60he.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SMUSH_=\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\imuse.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\smush\scumm\sound.h"\
-	"..\..\..\scumm\smush\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SMUSH_=\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\imuse.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\smush\scumm\sound.h"\
-	"..\..\..\scumm\smush\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SMUSH_=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIPT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SMUSH_=\
+NODEP_CPP_SCRIPT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SMUSH_=\
+DEP_CPP_SCRIPT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -1381,109 +1431,160 @@ DEP_CPP_SMUSH_=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\sound.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SMUSH_=\
+NODEP_CPP_SCRIPT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SCRIPT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SCRIPT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SCRIPT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SCRIPT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SMUSH_=\
+DEP_CPP_SCRIPT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SMUSH_=\
+NODEP_CPP_SCRIPT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SMUSH_=\
+DEP_CPP_SCRIPT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SMUSH_=\
+NODEP_CPP_SCRIPT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
 !ENDIF 
@@ -1491,132 +1592,54 @@ NODEP_CPP_SMUSH_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\smush_mixer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\smush_player.cpp
+SOURCE=..\..\..\engines\scumm\he\script_v70he.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SMUSH_P=\
-	"..\..\..\scumm\smush\base\engine.h"\
-	"..\..\..\scumm\smush\common\config-manager.h"\
-	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\common\system.h"\
-	"..\..\..\scumm\smush\common\timer.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\bomp.h"\
-	"..\..\..\scumm\smush\scumm\imuse.h"\
-	"..\..\..\scumm\smush\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\smush\scumm\insane\insane.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\smush\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\smush\scumm\sound.h"\
-	"..\..\..\scumm\smush\sound\mixer.h"\
-	"..\..\..\scumm\smush\sound\mp3.h"\
-	"..\..\..\scumm\smush\sound\vorbis.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SMUSH_P=\
-	"..\..\..\scumm\smush\base\engine.h"\
-	"..\..\..\scumm\smush\common\config-manager.h"\
-	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\stdafx.h"\
-	"..\..\..\scumm\smush\common\system.h"\
-	"..\..\..\scumm\smush\common\timer.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\bomp.h"\
-	"..\..\..\scumm\smush\scumm\imuse.h"\
-	"..\..\..\scumm\smush\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\smush\scumm\insane\insane.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\smush\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\smush\scumm\sound.h"\
-	"..\..\..\scumm\smush\sound\mixer.h"\
-	"..\..\..\scumm\smush\sound\mp3.h"\
-	"..\..\..\scumm\smush\sound\vorbis.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SMUSH_P=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIPT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_SMUSH_P=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
-	".\lib.h"\
-	".\LIB\zconf.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SMUSH_P=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -1625,7 +1648,8 @@ DEP_CPP_SMUSH_P=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1636,40 +1660,29 @@ DEP_CPP_SMUSH_P=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"zlib.h"\
-	{$(INCLUDE)}"ZLIB\zconf.h"\
 	
-NODEP_CPP_SMUSH_P=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -1677,311 +1690,174 @@ NODEP_CPP_SMUSH_P=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SMUSH_P=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_SMUSH_P=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SMUSH_P=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\smush_mixer.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_SMUSH_P=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\smush_player.h
-# End Source File
-# End Group
-# Begin Group "insane"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\scumm\insane\insane.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_INSAN=\
-	"..\..\..\scumm\insane\base\engine.h"\
-	"..\..\..\scumm\insane\common\stdafx.h"\
-	"..\..\..\scumm\insane\common\system.h"\
-	"..\..\..\scumm\insane\scumm\actor.h"\
-	"..\..\..\scumm\insane\scumm\imuse.h"\
-	"..\..\..\scumm\insane\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\insane\scumm\insane\insane.h"\
-	"..\..\..\scumm\insane\scumm\scumm.h"\
-	"..\..\..\scumm\insane\scumm\smush\chunk.h"\
-	"..\..\..\scumm\insane\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\insane\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\insane\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\insane\scumm\sound.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_INSAN=\
-	"..\..\..\scumm\insane\base\engine.h"\
-	"..\..\..\scumm\insane\common\stdafx.h"\
-	"..\..\..\scumm\insane\common\system.h"\
-	"..\..\..\scumm\insane\scumm\actor.h"\
-	"..\..\..\scumm\insane\scumm\imuse.h"\
-	"..\..\..\scumm\insane\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\insane\scumm\insane\insane.h"\
-	"..\..\..\scumm\insane\scumm\scumm.h"\
-	"..\..\..\scumm\insane\scumm\smush\chunk.h"\
-	"..\..\..\scumm\insane\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\insane\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\insane\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\insane\scumm\sound.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_INSAN=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSAN=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_INSAN=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INSAN=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\he\script_v72he.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_INSAN=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -1989,294 +1865,235 @@ DEP_CPP_INSAN=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSAN=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_INSAN=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.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"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_font.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSAN=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\insane\insane.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\insane\insane_ben.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_INSANE=\
-	"..\..\..\scumm\insane\base\engine.h"\
-	"..\..\..\scumm\insane\common\stdafx.h"\
-	"..\..\..\scumm\insane\scumm\insane\insane.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_INSANE=\
-	"..\..\..\scumm\insane\base\engine.h"\
-	"..\..\..\scumm\insane\common\stdafx.h"\
-	"..\..\..\scumm\insane\scumm\insane\insane.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_INSANE=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSANE=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_INSANE=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INSANE=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_INSANE=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSANE=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_INSANE=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSANE=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	"..\..\..\engines\scumm\he\scumm\verbs.h"\
 	
 
 !ENDIF 
@@ -2284,332 +2101,279 @@ NODEP_CPP_INSANE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\insane\insane_enemy.cpp
+SOURCE=..\..\..\engines\scumm\he\script_v80he.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_INSANE_=\
-	"..\..\..\scumm\insane\base\engine.h"\
-	"..\..\..\scumm\insane\common\stdafx.h"\
-	"..\..\..\scumm\insane\scumm\insane\insane.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_INSANE_=\
-	"..\..\..\scumm\insane\base\engine.h"\
-	"..\..\..\scumm\insane\common\stdafx.h"\
-	"..\..\..\scumm\insane\scumm\insane\insane.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_INSANE_=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSANE_=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_INSANE_=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INSANE_=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_INSANE_=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSANE_=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_INSANE_=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSANE_=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\insane\insane_iact.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_INSANE_I=\
-	"..\..\..\scumm\insane\base\engine.h"\
-	"..\..\..\scumm\insane\common\stdafx.h"\
-	"..\..\..\scumm\insane\scumm\insane\insane.h"\
-	"..\..\..\scumm\insane\scumm\scumm.h"\
-	"..\..\..\scumm\insane\scumm\smush\chunk.h"\
-	"..\..\..\scumm\insane\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\insane\scumm\smush\smush_player.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_INSANE_I=\
-	"..\..\..\scumm\insane\base\engine.h"\
-	"..\..\..\scumm\insane\common\stdafx.h"\
-	"..\..\..\scumm\insane\scumm\insane\insane.h"\
-	"..\..\..\scumm\insane\scumm\scumm.h"\
-	"..\..\..\scumm\insane\scumm\smush\chunk.h"\
-	"..\..\..\scumm\insane\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\insane\scumm\smush\smush_player.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_INSANE_I=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSANE_I=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_INSANE_I=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INSANE_I=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\he\script_v90he.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_INSANE_I=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIPT_V9=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_V9=\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\sound.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_SCRIPT_V9=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -2623,74 +2387,126 @@ DEP_CPP_INSANE_I=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSANE_I=\
+NODEP_CPP_SCRIPT_V9=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SCRIPT_V9=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_V9=\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\sound.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SCRIPT_V9=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_V9=\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\sound.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SCRIPT_V9=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_V9=\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\sound.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_INSANE_I=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_SCRIPT_V9=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSANE_I=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_SCRIPT_V9=\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\charset.h"\
+	"..\..\..\engines\scumm\he\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\object.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\sound.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
 !ENDIF 
@@ -2698,79 +2514,62 @@ NODEP_CPP_INSANE_I=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\insane\insane_scenes.cpp
+SOURCE=..\..\..\engines\scumm\he\sound_he.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_INSANE_S=\
-	"..\..\..\scumm\insane\base\engine.h"\
-	"..\..\..\scumm\insane\common\config-manager.h"\
-	"..\..\..\scumm\insane\common\stdafx.h"\
-	"..\..\..\scumm\insane\scumm\insane\insane.h"\
-	"..\..\..\scumm\insane\scumm\scumm.h"\
-	"..\..\..\scumm\insane\scumm\sound.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_INSANE_S=\
-	"..\..\..\scumm\insane\base\engine.h"\
-	"..\..\..\scumm\insane\common\config-manager.h"\
-	"..\..\..\scumm\insane\common\stdafx.h"\
-	"..\..\..\scumm\insane\scumm\insane\insane.h"\
-	"..\..\..\scumm\insane\scumm\scumm.h"\
-	"..\..\..\scumm\insane\scumm\sound.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_INSANE_S=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_INSANE_S=\
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_INSANE_S=\
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -2779,7 +2578,8 @@ DEP_CPP_INSANE_S=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -2787,273 +2587,256 @@ DEP_CPP_INSANE_S=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_INSANE_S=\
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_INSANE_S=\
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_INSANE_S=\
-	"..\..\..\common\config.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_INSANE_S=\
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_INSANE_S=\
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "imuse_digi"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\scumm\imuse_digi\dimuse.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_DIMUS=\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\common\system.h"\
-	"..\..\..\scumm\imuse_digi\common\timer.h"\
-	"..\..\..\scumm\imuse_digi\scumm\actor.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\saveload.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	"..\..\..\scumm\imuse_digi\scumm\sound.h"\
-	"..\..\..\scumm\imuse_digi\sound\audiostream.h"\
-	"..\..\..\scumm\imuse_digi\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_DIMUS=\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\common\system.h"\
-	"..\..\..\scumm\imuse_digi\common\timer.h"\
-	"..\..\..\scumm\imuse_digi\scumm\actor.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\saveload.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	"..\..\..\scumm\imuse_digi\scumm\sound.h"\
-	"..\..\..\scumm\imuse_digi\sound\audiostream.h"\
-	"..\..\..\scumm\imuse_digi\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_DIMUS=\
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_DIMUS=\
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_DIMUS=\
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_DIMUS=\
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\actor.h"\
+	"..\..\..\engines\scumm\he\scumm\file.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\he\sound_he.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\scumm\he\sprite_he.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-DEP_CPP_DIMUS=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\saveload.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_SPRIT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -3064,29 +2847,28 @@ DEP_CPP_DIMUS=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_DIMUS=\
+NODEP_CPP_SPRIT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -3094,47 +2876,76 @@ NODEP_CPP_DIMUS=\
 	"..\..\..\common\palmversion.h"\
 	
 
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\saveload.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\saveload.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\saveload.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_DIMUS=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_SPRIT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DIMUS=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\saveload.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
 !ENDIF 
@@ -3142,66 +2953,50 @@ NODEP_CPP_DIMUS=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\imuse_digi\dimuse.h
+SOURCE=..\..\..\engines\scumm\he\sprite_he.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\imuse_digi\dimuse_bndmgr.cpp
+SOURCE=..\..\..\engines\scumm\he\wiz_he.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_DIMUSE=\
-	"..\..\..\scumm\imuse_digi\common\scummsys.h"\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	"..\..\..\scumm\imuse_digi\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_DIMUSE=\
-	"..\..\..\scumm\imuse_digi\common\scummsys.h"\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	"..\..\..\scumm\imuse_digi\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_DIMUSE=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_WIZ_H=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_DIMUSE=\
+NODEP_CPP_WIZ_H=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_DIMUSE=\
+DEP_CPP_WIZ_H=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -3209,391 +3004,345 @@ DEP_CPP_DIMUSE=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_DIMUSE=\
+NODEP_CPP_WIZ_H=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_DIMUSE=\
+DEP_CPP_WIZ_H=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_DIMUSE=\
+NODEP_CPP_WIZ_H=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_DIMUSE=\
+DEP_CPP_WIZ_H=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_DIMUSE=\
+NODEP_CPP_WIZ_H=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-SOURCE=..\..\..\scumm\imuse_digi\dimuse_bndmgr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\imuse_digi\dimuse_codecs.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_DIMUSE_=\
-	"..\..\..\scumm\imuse_digi\common\scummsys.h"\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\common\util.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_DIMUSE_=\
-	"..\..\..\scumm\imuse_digi\common\scummsys.h"\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\common\util.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_DIMUSE_=\
+DEP_CPP_WIZ_H=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_DIMUSE_=\
+NODEP_CPP_WIZ_H=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_DIMUSE_=\
+DEP_CPP_WIZ_H=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_DIMUSE_=\
+NODEP_CPP_WIZ_H=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
+	"..\..\..\engines\scumm\he\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\he\scumm\resource.h"\
+	"..\..\..\engines\scumm\he\scumm\scumm.h"\
+	"..\..\..\engines\scumm\he\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\he\wiz_he.h
+# End Source File
+# End Group
+# Begin Group "imuse"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+# PROP Default_Filter ""
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+SOURCE=..\..\..\engines\scumm\imuse\imuse.cpp
 
-DEP_CPP_DIMUSE_=\
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_IMUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_DIMUSE_=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_DIMUSE_=\
+DEP_CPP_IMUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_DIMUSE_=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\imuse_digi\dimuse_music.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_DIMUSE_M=\
-	"..\..\..\scumm\imuse_digi\common\scummsys.h"\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_DIMUSE_M=\
-	"..\..\..\scumm\imuse_digi\common\scummsys.h"\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_DIMUSE_M=\
+DEP_CPP_IMUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DIMUSE_M=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_DIMUSE_M=\
+DEP_CPP_IMUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_DIMUSE_M=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_DIMUSE_M=\
+DEP_CPP_IMUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DIMUSE_M=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_DIMUSE_M=\
+DEP_CPP_IMUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DIMUSE_M=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
 !ENDIF 
@@ -3601,117 +3350,66 @@ NODEP_CPP_DIMUSE_M=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\imuse_digi\dimuse_script.cpp
+SOURCE=..\..\..\engines\scumm\imuse\imuse.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\scumm\imuse\imuse_internal.h
+# End Source File
+# Begin Source File
 
-NODEP_CPP_DIMUSE_S=\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\common\system.h"\
-	"..\..\..\scumm\imuse_digi\common\timer.h"\
-	"..\..\..\scumm\imuse_digi\scumm\actor.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	"..\..\..\scumm\imuse_digi\scumm\sound.h"\
-	"..\..\..\scumm\imuse_digi\sound\audiostream.h"\
-	"..\..\..\scumm\imuse_digi\sound\mixer.h"\
-	
+SOURCE=..\..\..\engines\scumm\imuse\imuse_part.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_DIMUSE_S=\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\common\system.h"\
-	"..\..\..\scumm\imuse_digi\common\timer.h"\
-	"..\..\..\scumm\imuse_digi\scumm\actor.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	"..\..\..\scumm\imuse_digi\scumm\sound.h"\
-	"..\..\..\scumm\imuse_digi\sound\audiostream.h"\
-	"..\..\..\scumm\imuse_digi\sound\mixer.h"\
-	
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_DIMUSE_S=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_IMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DIMUSE_S=\
+NODEP_CPP_IMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_DIMUSE_S=\
+DEP_CPP_IMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_DIMUSE_S=\
+NODEP_CPP_IMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -3719,270 +3417,133 @@ NODEP_CPP_DIMUSE_S=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_DIMUSE_S=\
+DEP_CPP_IMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DIMUSE_S=\
+NODEP_CPP_IMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_DIMUSE_S=\
+DEP_CPP_IMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DIMUSE_S=\
+NODEP_CPP_IMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\imuse_digi\dimuse_sndmgr.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_DIMUSE_SN=\
-	"..\..\..\scumm\imuse_digi\common\scummsys.h"\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\common\util.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	"..\..\..\scumm\imuse_digi\scumm\util.h"\
-	"..\..\..\scumm\imuse_digi\sound\mp3.h"\
-	"..\..\..\scumm\imuse_digi\sound\voc.h"\
-	"..\..\..\scumm\imuse_digi\sound\vorbis.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_DIMUSE_SN=\
-	"..\..\..\scumm\imuse_digi\common\scummsys.h"\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\common\util.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	"..\..\..\scumm\imuse_digi\scumm\util.h"\
-	"..\..\..\scumm\imuse_digi\sound\mp3.h"\
-	"..\..\..\scumm\imuse_digi\sound\voc.h"\
-	"..\..\..\scumm\imuse_digi\sound\vorbis.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_DIMUSE_SN=\
+DEP_CPP_IMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\voc.h"\
-	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_DIMUSE_SN=\
+NODEP_CPP_IMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_DIMUSE_SN=\
+DEP_CPP_IMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\voc.h"\
-	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_DIMUSE_SN=\
+NODEP_CPP_IMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\imuse\imuse_player.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_DIMUSE_SN=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_IMUSE_P=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\voc.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_DIMUSE_SN=\
+NODEP_CPP_IMUSE_P=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_DIMUSE_SN=\
+DEP_CPP_IMUSE_P=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -3996,193 +3557,127 @@ DEP_CPP_DIMUSE_SN=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\voc.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_DIMUSE_SN=\
+NODEP_CPP_IMUSE_P=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\imuse_digi\dimuse_sndmgr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\imuse_digi\dimuse_tables.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_DIMUSE_T=\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_DIMUSE_T=\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_DIMUSE_T=\
+DEP_CPP_IMUSE_P=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_DIMUSE_T=\
+NODEP_CPP_IMUSE_P=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_DIMUSE_T=\
+DEP_CPP_IMUSE_P=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_DIMUSE_T=\
+NODEP_CPP_IMUSE_P=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_DIMUSE_T=\
+DEP_CPP_IMUSE_P=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_DIMUSE_T=\
+NODEP_CPP_IMUSE_P=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_DIMUSE_T=\
+DEP_CPP_IMUSE_P=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_DIMUSE_T=\
+NODEP_CPP_IMUSE_P=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\imuse_digi\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
 !ENDIF 
@@ -4190,80 +3685,42 @@ NODEP_CPP_DIMUSE_T=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\imuse_digi\dimuse_track.cpp
+SOURCE=..\..\..\engines\scumm\imuse\instrument.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_DIMUSE_TR=\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\common\timer.h"\
-	"..\..\..\scumm\imuse_digi\scumm\actor.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	"..\..\..\scumm\imuse_digi\scumm\sound.h"\
-	"..\..\..\scumm\imuse_digi\sound\audiostream.h"\
-	"..\..\..\scumm\imuse_digi\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_DIMUSE_TR=\
-	"..\..\..\scumm\imuse_digi\common\stdafx.h"\
-	"..\..\..\scumm\imuse_digi\common\timer.h"\
-	"..\..\..\scumm\imuse_digi\scumm\actor.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\scumm\scumm.h"\
-	"..\..\..\scumm\imuse_digi\scumm\sound.h"\
-	"..\..\..\scumm\imuse_digi\sound\audiostream.h"\
-	"..\..\..\scumm\imuse_digi\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_DIMUSE_TR=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_INSTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_DIMUSE_TR=\
+NODEP_CPP_INSTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_DIMUSE_TR=\
+DEP_CPP_INSTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -4279,22 +3736,16 @@ DEP_CPP_DIMUSE_TR=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_DIMUSE_TR=\
+NODEP_CPP_INSTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -4302,802 +3753,458 @@ NODEP_CPP_DIMUSE_TR=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_DIMUSE_TR=\
+DEP_CPP_INSTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_DIMUSE_TR=\
+NODEP_CPP_INSTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_DIMUSE_TR=\
+DEP_CPP_INSTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_DIMUSE_TR=\
+NODEP_CPP_INSTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_INSTR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_INSTR=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_INSTR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_INSTR=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\imuse\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse\scumm\scumm.h"\
 	
 
 !ENDIF 
 
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=..\..\..\scumm\actor.cpp
+SOURCE=..\..\..\engines\scumm\imuse\instrument.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\scumm\imuse\sysex.h
+# End Source File
+# Begin Source File
 
-NODEP_CPP_ACTOR=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\akos.h"\
-	"..\..\..\scumm\scumm\boxes.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\costume.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
+SOURCE=..\..\..\engines\scumm\imuse\sysex_samnmax.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ACTOR=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\akos.h"\
-	"..\..\..\scumm\scumm\boxes.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\costume.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ACTOR=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SYSEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_SYSEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_SYSEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_SYSEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_ACTOR=\
+DEP_CPP_SYSEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_SYSEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_SYSEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_SYSEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\actor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\akos.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_AKOS_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\akos.h"\
-	"..\..\..\scumm\scumm\bomp.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_AKOS_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\akos.h"\
-	"..\..\..\scumm\scumm\bomp.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_SYSEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_SYSEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_SYSEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_SYSEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\imuse\sysex_scumm.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_AKOS_=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SYSEX_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_SYSEX_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_SYSEX_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\imuse_internal.h"\
+	"..\..\..\engines\scumm\imuse\instrument.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_SYSEX_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\akos.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\scumm\base-costume.cpp"
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_BASE_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\base-costume.h"\
-	"..\..\..\scumm\scumm\costume.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_BASE_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\base-costume.h"\
-	"..\..\..\scumm\scumm\costume.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_BASE_=\
+DEP_CPP_SYSEX_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
-NODEP_CPP_BASE_=\
+NODEP_CPP_SYSEX_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_BASE_=\
+DEP_CPP_SYSEX_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_BASE_=\
+NODEP_CPP_SYSEX_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_BASE_=\
+DEP_CPP_SYSEX_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
-NODEP_CPP_BASE_=\
+NODEP_CPP_SYSEX_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_BASE_=\
+DEP_CPP_SYSEX_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
-NODEP_CPP_BASE_=\
+NODEP_CPP_SYSEX_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse\scumm\imuse\imuse_internal.h"\
 	
 
 !ENDIF 
 
 # End Source File
-# Begin Source File
+# End Group
+# Begin Group "imuse_digi"
 
-SOURCE="..\..\..\scumm\base-costume.h"
-# End Source File
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\scumm\bomp.cpp
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_BOMP_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\akos.h"\
-	"..\..\..\scumm\scumm\bomp.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_BOMP_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\akos.h"\
-	"..\..\..\scumm\scumm\bomp.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_BOMP_=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DIMUS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_BOMP_=\
+NODEP_CPP_DIMUS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_BOMP_=\
+DEP_CPP_DIMUS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -5105,102 +4212,165 @@ DEP_CPP_BOMP_=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_BOMP_=\
+NODEP_CPP_DIMUS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_DIMUS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_DIMUS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_DIMUS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_DIMUS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_BOMP_=\
+DEP_CPP_DIMUS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_BOMP_=\
+NODEP_CPP_DIMUS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_BOMP_=\
+DEP_CPP_DIMUS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_BOMP_=\
+NODEP_CPP_DIMUS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\saveload.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
 !ENDIF 
@@ -5208,69 +4378,43 @@ NODEP_CPP_BOMP_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\bomp.h
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\boxes.cpp
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_BOXES=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\boxes.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_BOXES=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\boxes.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_BOXES=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DIMUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_BOXES=\
+NODEP_CPP_DIMUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\file.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_BOXES=\
+DEP_CPP_DIMUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -5278,96 +4422,110 @@ DEP_CPP_BOXES=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_BOXES=\
+NODEP_CPP_DIMUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_DIMUSE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_DIMUSE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\file.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_DIMUSE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_DIMUSE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\file.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_BOXES=\
+DEP_CPP_DIMUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_BOXES=\
+NODEP_CPP_DIMUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\file.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_BOXES=\
+DEP_CPP_DIMUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
 	
-NODEP_CPP_BOXES=\
+NODEP_CPP_DIMUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\file.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\util.h"\
 	
 
 !ENDIF 
@@ -5375,317 +4533,182 @@ NODEP_CPP_BOXES=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\boxes.h
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\camera.cpp
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CAMER=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CAMER=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_CAMER=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DIMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_CAMER=\
+NODEP_CPP_DIMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CAMER=\
+DEP_CPP_DIMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CAMER=\
+NODEP_CPP_DIMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CAMER=\
+DEP_CPP_DIMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_CAMER=\
+NODEP_CPP_DIMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CAMER=\
+DEP_CPP_DIMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_CAMER=\
+NODEP_CPP_DIMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\charset.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_CHARS=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\nut_renderer.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_CHARS=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\nut_renderer.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CHARS=\
+DEP_CPP_DIMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_CHARS=\
+NODEP_CPP_DIMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CHARS=\
+DEP_CPP_DIMUSE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CHARS=\
+NODEP_CPP_DIMUSE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse_music.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CHARS=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DIMUSE_M=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_CHARS=\
+NODEP_CPP_DIMUSE_M=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CHARS=\
+DEP_CPP_DIMUSE_M=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -5693,232 +4716,107 @@ DEP_CPP_CHARS=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CHARS=\
+NODEP_CPP_DIMUSE_M=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\charset.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\costume.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_COSTU=\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\costume.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_COSTU=\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\costume.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_COSTU=\
+DEP_CPP_DIMUSE_M=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_COSTU=\
+NODEP_CPP_DIMUSE_M=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_COSTU=\
+DEP_CPP_DIMUSE_M=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_COSTU=\
+NODEP_CPP_DIMUSE_M=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_COSTU=\
+DEP_CPP_DIMUSE_M=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_COSTU=\
+NODEP_CPP_DIMUSE_M=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_COSTU=\
+DEP_CPP_DIMUSE_M=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_COSTU=\
+NODEP_CPP_DIMUSE_M=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
 	
 
 !ENDIF 
@@ -5926,85 +4824,50 @@ NODEP_CPP_COSTU=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\costume.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\cursor.cpp
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse_script.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CURSO=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\bomp.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CURSO=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\bomp.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_CURSO=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DIMUSE_S=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CURSO=\
+NODEP_CPP_DIMUSE_S=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CURSO=\
+DEP_CPP_DIMUSE_S=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -6015,723 +4878,353 @@ DEP_CPP_CURSO=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CURSO=\
+NODEP_CPP_DIMUSE_S=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CURSO=\
+DEP_CPP_DIMUSE_S=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CURSO=\
+NODEP_CPP_DIMUSE_S=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CURSO=\
+DEP_CPP_DIMUSE_S=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CURSO=\
+NODEP_CPP_DIMUSE_S=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\debugger.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_DEBUG=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\debugger.cpp"\
-	"..\..\..\scumm\common\file.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\str.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\boxes.h"\
-	"..\..\..\scumm\scumm\debugger.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\player_v2.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_DEBUG=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\debugger.cpp"\
-	"..\..\..\scumm\common\file.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\str.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\boxes.h"\
-	"..\..\..\scumm\scumm\debugger.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\player_v2.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_DEBUG=\
+DEP_CPP_DIMUSE_S=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DEBUG=\
+NODEP_CPP_DIMUSE_S=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_DEBUG=\
+DEP_CPP_DIMUSE_S=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_DEBUG=\
+NODEP_CPP_DIMUSE_S=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_DEBUG=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DIMUSE_SN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_DEBUG=\
+NODEP_CPP_DIMUSE_SN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_DEBUG=\
+DEP_CPP_DIMUSE_SN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_DEBUG=\
+NODEP_CPP_DIMUSE_SN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\debugger.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\dialogs.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_DIALO=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\scaler.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\gui\about.h"\
-	"..\..\..\scumm\gui\chooser.h"\
-	"..\..\..\scumm\gui\ListWidget.h"\
-	"..\..\..\scumm\gui\newgui.h"\
-	"..\..\..\scumm\KeysDialog.h"\
-	"..\..\..\scumm\scumm\dialogs.h"\
-	"..\..\..\scumm\scumm\help.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\player_v2.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_DIALO=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\scaler.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\gui\about.h"\
-	"..\..\..\scumm\gui\chooser.h"\
-	"..\..\..\scumm\gui\ListWidget.h"\
-	"..\..\..\scumm\gui\newgui.h"\
-	"..\..\..\scumm\KeysDialog.h"\
-	"..\..\..\scumm\scumm\dialogs.h"\
-	"..\..\..\scumm\scumm\help.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\player_v2.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_DIALO=\
+DEP_CPP_DIMUSE_SN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_DIALO=\
+NODEP_CPP_DIMUSE_SN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\KeysDialog.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_DIALO=\
+DEP_CPP_DIMUSE_SN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_DIALO=\
+NODEP_CPP_DIMUSE_SN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\KeysDialog.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_DIALO=\
+DEP_CPP_DIMUSE_SN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_DIALO=\
+NODEP_CPP_DIMUSE_SN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\KeysDialog.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_DIALO=\
+DEP_CPP_DIMUSE_SN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_DIALO=\
+NODEP_CPP_DIMUSE_SN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\KeysDialog.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\util.h"\
 	
 
 !ENDIF 
@@ -6739,218 +5232,109 @@ NODEP_CPP_DIALO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\dialogs.h
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\gfx.cpp
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse_tables.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_GFX_C=\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_GFX_C=\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_GFX_C=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DIMUSE_T=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_GFX_C=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	".\DL_byteorder.h"\
+NODEP_CPP_DIMUSE_T=\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_GFX_C=\
+DEP_CPP_DIMUSE_T=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GFX_C=\
+NODEP_CPP_DIMUSE_T=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_DIMUSE_T=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_DIMUSE_T=\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_DIMUSE_T=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_DIMUSE_T=\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_GFX_C=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_DIMUSE_T=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_GFX_C=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+NODEP_CPP_DIMUSE_T=\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_GFX_C=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_DIMUSE_T=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_GFX_C=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\arm\macros.h"\
-	"..\..\..\scumm\arm\native.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+NODEP_CPP_DIMUSE_T=\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm_globals.h"\
 	
 
 !ENDIF 
@@ -6958,63 +5342,48 @@ NODEP_CPP_GFX_C=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\gfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\help.cpp
+SOURCE=..\..\..\engines\scumm\imuse_digi\dimuse_track.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_HELP_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\str.h"\
-	"..\..\..\scumm\scumm\help.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_HELP_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\str.h"\
-	"..\..\..\scumm\scumm\help.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_HELP_=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DIMUSE_TR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_HELP_=\
+NODEP_CPP_DIMUSE_TR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_HELP_=\
+DEP_CPP_DIMUSE_TR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -7022,302 +5391,254 @@ DEP_CPP_HELP_=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_HELP_=\
+NODEP_CPP_DIMUSE_TR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_HELP_=\
+DEP_CPP_DIMUSE_TR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_HELP_=\
+NODEP_CPP_DIMUSE_TR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_HELP_=\
+DEP_CPP_DIMUSE_TR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_HELP_=\
+NODEP_CPP_DIMUSE_TR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\help.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\imuse.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_IMUSE_=\
-	"..\..\..\scumm\base\version.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_internal.h"\
-	"..\..\..\scumm\scumm\instrument.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_IMUSE_=\
-	"..\..\..\scumm\base\version.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_internal.h"\
-	"..\..\..\scumm\scumm\instrument.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_IMUSE_=\
+DEP_CPP_DIMUSE_TR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_internal.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_IMUSE_=\
+NODEP_CPP_DIMUSE_TR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_IMUSE_=\
+DEP_CPP_DIMUSE_TR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_internal.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_IMUSE_=\
+NODEP_CPP_DIMUSE_TR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\actor.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\scumm.h"\
+	"..\..\..\engines\scumm\imuse_digi\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# End Group
+# Begin Group "insane"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+# PROP Default_Filter ""
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\scumm\insane\insane.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-DEP_CPP_IMUSE_=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_INSAN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_internal.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_IMUSE_=\
+NODEP_CPP_INSAN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\actor.h"\
+	"..\..\..\engines\scumm\insane\scumm\file.h"\
+	"..\..\..\engines\scumm\insane\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\insane\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\insane\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_IMUSE_=\
+DEP_CPP_INSAN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\sound.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_internal.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_IMUSE_=\
+NODEP_CPP_INSAN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -7325,197 +5646,140 @@ NODEP_CPP_IMUSE_=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\imuse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\imuse_internal.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\imuse_player.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_IMUSE_P=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\imuse_internal.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\sound\midiparser.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_IMUSE_P=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\imuse_internal.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\sound\midiparser.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_IMUSE_P=\
+DEP_CPP_INSAN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_internal.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_IMUSE_P=\
+NODEP_CPP_INSAN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\insane\scumm\actor.h"\
+	"..\..\..\engines\scumm\insane\scumm\file.h"\
+	"..\..\..\engines\scumm\insane\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\insane\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\insane\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_IMUSE_P=\
+DEP_CPP_INSAN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_internal.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_IMUSE_P=\
+NODEP_CPP_INSAN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\actor.h"\
+	"..\..\..\engines\scumm\insane\scumm\file.h"\
+	"..\..\..\engines\scumm\insane\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\insane\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\insane\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_IMUSE_P=\
+DEP_CPP_INSAN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_internal.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_IMUSE_P=\
+NODEP_CPP_INSAN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\actor.h"\
+	"..\..\..\engines\scumm\insane\scumm\file.h"\
+	"..\..\..\engines\scumm\insane\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\insane\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\insane\scumm\sound.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_IMUSE_P=\
+DEP_CPP_INSAN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_internal.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_IMUSE_P=\
+NODEP_CPP_INSAN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\actor.h"\
+	"..\..\..\engines\scumm\insane\scumm\file.h"\
+	"..\..\..\engines\scumm\insane\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\insane\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\insane\scumm\sound.h"\
 	
 
 !ENDIF 
@@ -7523,454 +5787,202 @@ NODEP_CPP_IMUSE_P=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\input.cpp
+SOURCE=..\..\..\engines\scumm\insane\insane.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\insane\insane_ben.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_INPUT=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\gui\message.h"\
-	"..\..\..\scumm\gui\newgui.h"\
-	"..\..\..\scumm\scumm\debugger.h"\
-	"..\..\..\scumm\scumm\dialogs.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\insane\insane.h"\
-	"..\..\..\scumm\scumm\logic_he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_INPUT=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\gui\message.h"\
-	"..\..\..\scumm\gui\newgui.h"\
-	"..\..\..\scumm\scumm\debugger.h"\
-	"..\..\..\scumm\scumm\dialogs.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\insane\insane.h"\
-	"..\..\..\scumm\scumm\logic_he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_INPUT=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_INSANE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INPUT=\
+NODEP_CPP_INSANE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_INPUT=\
+DEP_CPP_INSANE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\sound.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INPUT=\
+NODEP_CPP_INSANE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_INPUT=\
+DEP_CPP_INSANE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INPUT=\
+NODEP_CPP_INSANE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_INPUT=\
+DEP_CPP_INSANE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INPUT=\
+NODEP_CPP_INSANE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\instrument.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_INSTR=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\instrument.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_INSTR=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\instrument.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_INSTR=\
+DEP_CPP_INSANE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_INSTR=\
+NODEP_CPP_INSANE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_INSTR=\
+DEP_CPP_INSANE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INSTR=\
+NODEP_CPP_INSANE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\insane\insane_enemy.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_INSTR=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_INSANE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_INSTR=\
+NODEP_CPP_INSANE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_INSTR=\
+DEP_CPP_INSANE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -7986,15 +5998,25 @@ DEP_CPP_INSTR=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\sound.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\instrument.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_INSTR=\
+NODEP_CPP_INSANE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -8002,173 +6024,84 @@ NODEP_CPP_INSTR=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\instrument.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\intern.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\logic_he.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_LOGIC=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\logic_he.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_LOGIC=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\logic_he.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_LOGIC=\
+DEP_CPP_INSANE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_LOGIC=\
+NODEP_CPP_INSANE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_LOGIC=\
+DEP_CPP_INSANE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_LOGIC=\
+NODEP_CPP_INSANE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_LOGIC=\
+DEP_CPP_INSANE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_LOGIC=\
+NODEP_CPP_INSANE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_LOGIC=\
+DEP_CPP_INSANE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_LOGIC=\
+NODEP_CPP_INSANE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
 	
 
 !ENDIF 
@@ -8176,71 +6109,4503 @@ NODEP_CPP_LOGIC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\logic_he.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\midiparser_eup.cpp
+SOURCE=..\..\..\engines\scumm\insane\insane_iact.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MIDIP=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\midiparser.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MIDIP=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\midiparser.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_MIDIP=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_INSANE_I=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_MIDIP=\
+NODEP_CPP_INSANE_I=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_player.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIDIP=\
+DEP_CPP_INSANE_I=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_INSANE_I=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_INSANE_I=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	
+NODEP_CPP_INSANE_I=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_player.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_INSANE_I=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	
+NODEP_CPP_INSANE_I=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_player.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_INSANE_I=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	
+NODEP_CPP_INSANE_I=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_player.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_INSANE_I=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	
+NODEP_CPP_INSANE_I=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\insane\scumm\smush\smush_player.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\insane\insane_scenes.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_INSANE_S=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INSANE_S=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_INSANE_S=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_INSANE_S=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_INSANE_S=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INSANE_S=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_INSANE_S=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INSANE_S=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_INSANE_S=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INSANE_S=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_INSANE_S=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INSANE_S=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\insane\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\insane\scumm\scumm.h"\
+	"..\..\..\engines\scumm\insane\scumm\sound.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "smush"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\channel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\chunk.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CHUNK=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CHUNK=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\file.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CHUNK=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_CHUNK=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CHUNK=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CHUNK=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\file.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CHUNK=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CHUNK=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\file.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CHUNK=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CHUNK=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\file.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CHUNK=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CHUNK=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\file.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\chunk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\chunk_type.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\codec1.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CODEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CODEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CODEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CODEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CODEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CODEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CODEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CODEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CODEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CODEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CODEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CODEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\codec37.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CODEC3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CODEC3=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\codec37.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CODEC3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	
+NODEP_CPP_CODEC3=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CODEC3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CODEC3=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\codec37.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CODEC3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CODEC3=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\codec37.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CODEC3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CODEC3=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\codec37.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CODEC3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CODEC3=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\codec37.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\codec37.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\codec47.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CODEC4=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CODEC4=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CODEC4=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	
+NODEP_CPP_CODEC4=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CODEC4=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CODEC4=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CODEC4=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CODEC4=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CODEC4=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CODEC4=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CODEC4=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CODEC4=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\scumm_globals.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\codec47.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\imuse_channel.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_IMUSE_C=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_IMUSE_C=\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_IMUSE_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\chunk_type.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_IMUSE_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_IMUSE_C=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_IMUSE_C=\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_IMUSE_C=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_IMUSE_C=\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_IMUSE_C=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_IMUSE_C=\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_IMUSE_C=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_IMUSE_C=\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\saud_channel.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SAUD_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SAUD_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_SAUD_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\chunk_type.h"\
+	
+NODEP_CPP_SAUD_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SAUD_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SAUD_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SAUD_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SAUD_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SAUD_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SAUD_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_SAUD_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SAUD_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\smush_font.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SMUSH=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SMUSH=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_SMUSH=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_SMUSH=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SMUSH=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SMUSH=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SMUSH=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SMUSH=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SMUSH=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SMUSH=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_SMUSH=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SMUSH=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\scumm\util.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\smush_font.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\smush_mixer.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SMUSH_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SMUSH_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_SMUSH_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SMUSH_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SMUSH_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SMUSH_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SMUSH_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SMUSH_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SMUSH_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SMUSH_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_SMUSH_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SMUSH_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\scumm\sound.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\smush_mixer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\smush_player.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SMUSH_P=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_SMUSH_P=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\file.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\smush\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_SMUSH_P=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\bomp.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_SMUSH_P=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SMUSH_P=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_SMUSH_P=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\file.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\smush\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SMUSH_P=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_SMUSH_P=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\file.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\smush\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SMUSH_P=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_SMUSH_P=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\file.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\smush\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_SMUSH_P=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_SMUSH_P=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\smush\scumm\bomp.h"\
+	"..\..\..\engines\scumm\smush\scumm\file.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\smush\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\smush\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\channel.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\chunk_type.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_font.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\smush\scumm\sound.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\smush\smush_player.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\actor.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ACTOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_ACTOR=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_ACTOR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\akos.h"\
+	"..\..\..\engines\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\boxes.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\costume.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_ACTOR=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_ACTOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_ACTOR=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_ACTOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_ACTOR=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_ACTOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_ACTOR=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_ACTOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_ACTOR=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\actor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\akos.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_AKOS_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_AKOS_=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_AKOS_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\akos.h"\
+	"..\..\..\engines\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\bomp.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_AKOS_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_AKOS_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_AKOS_=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_AKOS_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_AKOS_=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_AKOS_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_AKOS_=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_AKOS_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_AKOS_=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\akos.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\engines\scumm\base-costume.cpp"
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_BASE_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BASE_=\
+	"..\..\..\engines\scumm\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_BASE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\costume.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_BASE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_BASE_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BASE_=\
+	"..\..\..\engines\scumm\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_BASE_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BASE_=\
+	"..\..\..\engines\scumm\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_BASE_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BASE_=\
+	"..\..\..\engines\scumm\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_BASE_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BASE_=\
+	"..\..\..\engines\scumm\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\engines\scumm\base-costume.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\bomp.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_BOMP_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BOMP_=\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_BOMP_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\akos.h"\
+	"..\..\..\engines\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\bomp.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_BOMP_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_BOMP_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BOMP_=\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_BOMP_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BOMP_=\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_BOMP_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BOMP_=\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_BOMP_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_BOMP_=\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\bomp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\boxes.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_BOXES=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_BOXES=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_BOXES=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\boxes.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_BOXES=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_BOXES=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_BOXES=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_BOXES=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_BOXES=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_BOXES=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_BOXES=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_BOXES=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_BOXES=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\boxes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\camera.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CAMER=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CAMER=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CAMER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_CAMER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CAMER=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CAMER=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CAMER=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CAMER=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CAMER=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CAMER=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CAMER=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CAMER=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\charset.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CHARS=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CHARS=\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CHARS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_CHARS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CHARS=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CHARS=\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CHARS=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CHARS=\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CHARS=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CHARS=\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CHARS=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CHARS=\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\charset.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\costume.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_COSTU=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_COSTU=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_COSTU=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\costume.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_COSTU=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_COSTU=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_COSTU=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_COSTU=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_COSTU=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_COSTU=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_COSTU=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_COSTU=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_COSTU=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\costume.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\cursor.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CURSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	
+NODEP_CPP_CURSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CURSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\bomp.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_CURSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CURSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	
+NODEP_CPP_CURSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CURSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	
+NODEP_CPP_CURSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CURSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	
+NODEP_CPP_CURSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CURSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	
+NODEP_CPP_CURSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\debugger.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\boxes.h"\
+	"..\..\..\engines\scumm\debugger.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\debugger.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\dialogs.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\help.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\help.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\verbs.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\help.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\help.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\help.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\help.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\dialogs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\file.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_FILE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\md5.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_FILE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_FILE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\md5.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\file.h"\
+	
+NODEP_CPP_FILE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_FILE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\md5.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_FILE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_FILE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\md5.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_FILE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_FILE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\md5.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_FILE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_FILE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\md5.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_FILE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\file.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\gfx.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_GFX_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_GFX_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_GFX_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\usage_bits.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_GFX_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_GFX_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_GFX_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_GFX_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_GFX_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_GFX_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_GFX_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_GFX_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_GFX_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\gfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\help.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_HELP_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_HELP_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\help.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_HELP_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\help.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\surface.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MIDIP=\
+NODEP_CPP_HELP_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -8248,58 +10613,88 @@ NODEP_CPP_MIDIP=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_HELP_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_HELP_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\help.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_HELP_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_HELP_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\help.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDIP=\
+DEP_CPP_HELP_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIP=\
+NODEP_CPP_HELP_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\help.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDIP=\
+DEP_CPP_HELP_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIP=\
+NODEP_CPP_HELP_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\help.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
 !ENDIF 
@@ -8307,67 +10702,135 @@ NODEP_CPP_MIDIP=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\midiparser_ro.cpp
+SOURCE=..\..\..\engines\scumm\help.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\input.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MIDIPA=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\midiparser.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MIDIPA=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\midiparser.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_MIDIPA=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_INPUT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MIDIPA=\
+NODEP_CPP_INPUT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIDIPA=\
+DEP_CPP_INPUT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\debugger.h"\
+	"..\..\..\engines\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\help.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_MIDIPA=\
+NODEP_CPP_INPUT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -8375,58 +10838,196 @@ NODEP_CPP_MIDIPA=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_INPUT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_INPUT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_INPUT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_INPUT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDIPA=\
+DEP_CPP_INPUT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MIDIPA=\
+NODEP_CPP_INPUT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDIPA=\
+DEP_CPP_INPUT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MIDIPA=\
+NODEP_CPP_INPUT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
 	
 
 !ENDIF 
@@ -8434,543 +11035,332 @@ NODEP_CPP_MIDIPA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\music.h
+SOURCE=..\..\..\engines\scumm\intern.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\nut_renderer.cpp
+SOURCE=..\..\..\engines\scumm\midiparser_eup.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_NUT_R=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\nut_renderer.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_NUT_R=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\nut_renderer.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_NUT_R=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_NUT_R=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_NUT_R=\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_NUT_R=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_NUT_R=\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_NUT_R=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_NUT_R=\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_NUT_R=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\nut_renderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\object.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_OBJEC=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\bomp.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_OBJEC=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\bomp.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_OBJEC=\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_OBJEC=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_OBJEC=\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_OBJEC=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\midiparser_ro.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_OBJEC=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_OBJEC=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_OBJEC=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\bomp.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_OBJEC=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\palette.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PALET=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_PALET=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PALET=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PALET=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PALET=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PALET=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -8979,33 +11369,37 @@ NODEP_CPP_PALET=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\palette_he.cpp
+SOURCE=..\..\..\engines\scumm\music.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\scumm\nut_renderer.cpp
 
-NODEP_CPP_PALETT=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_PALETT=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_NUT_R=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_NUT_R=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_PALETT=\
+DEP_CPP_NUT_R=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -9016,33 +11410,126 @@ DEP_CPP_PALETT=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_PALETT=\
+NODEP_CPP_NUT_R=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
 	
 
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_NUT_R=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_NUT_R=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_NUT_R=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_NUT_R=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_NUT_R=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_NUT_R=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_NUT_R=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_NUT_R=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\nut_renderer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\object.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_PALETT=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_OBJEC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_OBJEC=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_OBJEC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -9053,75 +11540,159 @@ DEP_CPP_PALETT=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\bomp.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_PALETT=\
+NODEP_CPP_OBJEC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_OBJEC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_OBJEC=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_OBJEC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_OBJEC=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
+DEP_CPP_OBJEC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_OBJEC=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_OBJEC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_OBJEC=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\bomp.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\palette.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
 DEP_CPP_PALETT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
 NODEP_CPP_PALETT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
 DEP_CPP_PALETT=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -9134,194 +11705,132 @@ DEP_CPP_PALETT=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_PALETT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\player_mod.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PLAYE=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_mod.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	"..\..\..\scumm\sound\rate.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_PLAYE=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_mod.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	"..\..\..\scumm\sound\rate.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PLAYE=\
+DEP_CPP_PALETT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_PALETT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PLAYE=\
+DEP_CPP_PALETT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_PALETT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PLAYE=\
+DEP_CPP_PALETT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_PALETT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PLAYE=\
+DEP_CPP_PALETT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_PALETT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
 !ENDIF 
@@ -9329,69 +11838,42 @@ NODEP_CPP_PLAYE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\player_mod.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\player_nes.cpp
+SOURCE=..\..\..\engines\scumm\player_mod.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_PLAYER=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_nes.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_PLAYER=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_nes.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_PLAYER=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PLAYE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_nes.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
 	
-NODEP_CPP_PLAYER=\
+NODEP_CPP_PLAYE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\player_mod.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_PLAYER=\
+DEP_CPP_PLAYE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -9405,239 +11887,164 @@ DEP_CPP_PLAYER=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\player_mod.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_nes.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\rate.h"\
 	
-NODEP_CPP_PLAYER=\
+NODEP_CPP_PLAYE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_PLAYER=\
+DEP_CPP_PLAYE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_nes.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
 	
-NODEP_CPP_PLAYER=\
+NODEP_CPP_PLAYE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_mod.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PLAYER=\
+DEP_CPP_PLAYE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_nes.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
 	
-NODEP_CPP_PLAYER=\
+NODEP_CPP_PLAYE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_mod.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\player_nes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\player_v1.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PLAYER_=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_v1.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_PLAYER_=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_v1.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PLAYER_=\
+DEP_CPP_PLAYE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v1.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
 	
-NODEP_CPP_PLAYER_=\
+NODEP_CPP_PLAYE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\player_mod.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PLAYER_=\
+DEP_CPP_PLAYE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v1.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
 	
-NODEP_CPP_PLAYER_=\
+NODEP_CPP_PLAYE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_mod.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\player_mod.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\scumm\player_nes.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-DEP_CPP_PLAYER_=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PLAYER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v1.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_PLAYER_=\
+NODEP_CPP_PLAYER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_PLAYER_=\
+DEP_CPP_PLAYER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -9651,214 +12058,117 @@ DEP_CPP_PLAYER_=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v1.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_PLAYER_=\
+NODEP_CPP_PLAYER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\player_v1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\player_v2.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PLAYER_V=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_v2.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_PLAYER_V=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_v2.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PLAYER_V=\
+DEP_CPP_PLAYER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_PLAYER_V=\
+NODEP_CPP_PLAYER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PLAYER_V=\
+DEP_CPP_PLAYER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PLAYER_V=\
+NODEP_CPP_PLAYER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PLAYER_V=\
+DEP_CPP_PLAYER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_PLAYER_V=\
+NODEP_CPP_PLAYER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PLAYER_V=\
+DEP_CPP_PLAYER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_PLAYER_V=\
+NODEP_CPP_PLAYER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
 !ENDIF 
@@ -9866,66 +12176,44 @@ NODEP_CPP_PLAYER_V=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\player_v2.h
+SOURCE=..\..\..\engines\scumm\player_nes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\player_v2a.cpp
+SOURCE=..\..\..\engines\scumm\player_v1.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_PLAYER_V2=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_v2a.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_PLAYER_V2=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_v2a.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_PLAYER_V2=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PLAYER_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_v2a.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
 	
-NODEP_CPP_PLAYER_V2=\
+NODEP_CPP_PLAYER_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_PLAYER_V2=\
+DEP_CPP_PLAYER_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -9933,239 +12221,166 @@ DEP_CPP_PLAYER_V2=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_v2a.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	"..\..\..\sound\audiostream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_PLAYER_V2=\
+NODEP_CPP_PLAYER_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_PLAYER_V2=\
+DEP_CPP_PLAYER_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_v2a.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
 	
-NODEP_CPP_PLAYER_V2=\
+NODEP_CPP_PLAYER_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PLAYER_V2=\
+DEP_CPP_PLAYER_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_v2a.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
 	
-NODEP_CPP_PLAYER_V2=\
+NODEP_CPP_PLAYER_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\player_v2a.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\player_v3a.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PLAYER_V3=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_v3a.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_PLAYER_V3=\
-	"..\..\..\scumm\base\engine.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\player_v3a.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PLAYER_V3=\
+DEP_CPP_PLAYER_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_v3a.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
 	
-NODEP_CPP_PLAYER_V3=\
+NODEP_CPP_PLAYER_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PLAYER_V3=\
+DEP_CPP_PLAYER_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_v3a.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PLAYER_V3=\
+NODEP_CPP_PLAYER_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\player_v1.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\scumm\player_v2.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-DEP_CPP_PLAYER_V3=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PLAYER_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_v3a.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_PLAYER_V3=\
+NODEP_CPP_PLAYER_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_PLAYER_V3=\
+DEP_CPP_PLAYER_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -10173,319 +12388,140 @@ DEP_CPP_PLAYER_V3=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_v3a.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_PLAYER_V3=\
+NODEP_CPP_PLAYER_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\player_v3a.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\resource.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RESOU=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\str.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\dialogs.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RESOU=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\str.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\dialogs.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_RESOU=\
+DEP_CPP_PLAYER_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_RESOU=\
+NODEP_CPP_PLAYER_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_RESOU=\
+DEP_CPP_PLAYER_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_RESOU=\
+NODEP_CPP_PLAYER_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_RESOU=\
+DEP_CPP_PLAYER_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_RESOU=\
+NODEP_CPP_PLAYER_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_RESOU=\
+DEP_CPP_PLAYER_V=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_RESOU=\
+NODEP_CPP_PLAYER_V=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
 !ENDIF 
@@ -10493,69 +12529,44 @@ NODEP_CPP_RESOU=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\resource.h
+SOURCE=..\..\..\engines\scumm\player_v2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\resource_v2.cpp
+SOURCE=..\..\..\engines\scumm\player_v2a.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_RESOUR=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_RESOUR=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_RESOUR=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PLAYER_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_RESOUR=\
+NODEP_CPP_PLAYER_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_RESOUR=\
+DEP_CPP_PLAYER_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -10563,238 +12574,160 @@ DEP_CPP_RESOUR=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\player_mod.h"\
+	"..\..\..\engines\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_RESOUR=\
+NODEP_CPP_PLAYER_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_RESOUR=\
+DEP_CPP_PLAYER_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_RESOUR=\
+NODEP_CPP_PLAYER_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_RESOUR=\
+DEP_CPP_PLAYER_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_RESOUR=\
+NODEP_CPP_PLAYER_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\resource_v3.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RESOURC=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RESOURC=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_RESOURC=\
+DEP_CPP_PLAYER_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_RESOURC=\
+NODEP_CPP_PLAYER_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_RESOURC=\
+DEP_CPP_PLAYER_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_RESOURC=\
+NODEP_CPP_PLAYER_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\player_v2a.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\scumm\player_v3a.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-DEP_CPP_RESOURC=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PLAYER_V3=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_RESOURC=\
+NODEP_CPP_PLAYER_V3=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_RESOURC=\
+DEP_CPP_PLAYER_V3=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -10802,195 +12735,115 @@ DEP_CPP_RESOURC=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\player_mod.h"\
+	"..\..\..\engines\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_RESOURC=\
+NODEP_CPP_PLAYER_V3=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\resource_v4.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RESOURCE=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RESOURCE=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_RESOURCE=\
+DEP_CPP_PLAYER_V3=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_RESOURCE=\
+NODEP_CPP_PLAYER_V3=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_RESOURCE=\
+DEP_CPP_PLAYER_V3=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_RESOURCE=\
+NODEP_CPP_PLAYER_V3=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_RESOURCE=\
+DEP_CPP_PLAYER_V3=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_RESOURCE=\
+NODEP_CPP_PLAYER_V3=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_RESOURCE=\
+DEP_CPP_PLAYER_V3=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_RESOURCE=\
+NODEP_CPP_PLAYER_V3=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
 !ENDIF 
@@ -10998,90 +12851,76 @@ NODEP_CPP_RESOURCE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\resource_v7he.cpp
+SOURCE=..\..\..\engines\scumm\player_v3a.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\scumm\plugin.cpp
 
-NODEP_CPP_RESOURCE_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\stream.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\sound\wave.h"\
-	
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_RESOURCE_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\stream.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\sound\wave.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_RESOURCE_=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_RESOURCE_=\
+NODEP_CPP_PLUGI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\extras\palm-scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\plugin.h"\
+	"..\..\..\engines\scumm\scumm\scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_RESOURCE_=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -11090,602 +12929,427 @@ DEP_CPP_RESOURCE_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_RESOURCE_=\
+NODEP_CPP_PLUGI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\extras\palm-scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_RESOURCE_=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_RESOURCE_=\
+NODEP_CPP_PLUGI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\extras\palm-scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\plugin.h"\
+	"..\..\..\engines\scumm\scumm\scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_RESOURCE_=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_RESOURCE_=\
+NODEP_CPP_PLUGI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\extras\palm-scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\plugin.h"\
+	"..\..\..\engines\scumm\scumm\scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\resource_v7he.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\room.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ROOM_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\boxes.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ROOM_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\boxes.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ROOM_=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ROOM_=\
+NODEP_CPP_PLUGI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\extras\palm-scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\plugin.h"\
+	"..\..\..\engines\scumm\scumm\scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ROOM_=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_ROOM_=\
+NODEP_CPP_PLUGI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\extras\palm-scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\plugin.h"\
+	"..\..\..\engines\scumm\scumm\scumm-md5.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\plugin.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\scumm\resource.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-DEP_CPP_ROOM_=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RESOUR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ROOM_=\
+NODEP_CPP_RESOUR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ROOM_=\
+DEP_CPP_RESOUR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\help.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\engines\scumm\verbs.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ROOM_=\
+NODEP_CPP_RESOUR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\saveload.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SAVEL=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	"..\..\..\scumm\sound\audiocd.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SAVEL=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	"..\..\..\scumm\sound\audiocd.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SAVEL=\
+DEP_CPP_RESOUR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SAVEL=\
+NODEP_CPP_RESOUR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SAVEL=\
+DEP_CPP_RESOUR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_SAVEL=\
+NODEP_CPP_RESOUR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SAVEL=\
+DEP_CPP_RESOUR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SAVEL=\
+NODEP_CPP_RESOUR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SAVEL=\
+DEP_CPP_RESOUR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SAVEL=\
+NODEP_CPP_RESOUR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ENDIF 
@@ -11693,192 +13357,124 @@ NODEP_CPP_SAVEL=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\saveload.h
+SOURCE=..\..\..\engines\scumm\resource.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\script.cpp
+SOURCE=..\..\..\engines\scumm\resource_v2.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCRIP=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCRIP=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCRIP=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RESOURC=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIP=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+NODEP_CPP_RESOURC=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIP=\
+DEP_CPP_RESOURC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SCRIP=\
+NODEP_CPP_RESOURC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_RESOURC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_RESOURC=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_RESOURC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_RESOURC=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIP=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_RESOURC=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIP=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_RESOURC=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIP=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_RESOURC=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIP=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_RESOURC=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
 !ENDIF 
@@ -11886,78 +13482,33 @@ NODEP_CPP_SCRIP=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\script.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\script_c64.cpp
+SOURCE=..\..\..\engines\scumm\resource_v3.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCRIPT=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCRIPT=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCRIPT=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RESOURCE=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_SCRIPT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+NODEP_CPP_RESOURCE=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT=\
+DEP_CPP_RESOURCE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -11965,111 +13516,86 @@ DEP_CPP_SCRIPT=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SCRIPT=\
+NODEP_CPP_RESOURCE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_RESOURCE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_RESOURCE=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_RESOURCE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_RESOURCE=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_RESOURCE=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_SCRIPT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_RESOURCE=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_RESOURCE=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_SCRIPT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_RESOURCE=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
 !ENDIF 
@@ -12077,83 +13603,34 @@ NODEP_CPP_SCRIPT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\script_v100he.cpp
+SOURCE=..\..\..\engines\scumm\resource_v4.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCRIPT_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCRIPT_=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCRIPT_=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RESOURCE_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+NODEP_CPP_RESOURCE_=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_=\
+DEP_CPP_RESOURCE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -12167,120 +13644,85 @@ DEP_CPP_SCRIPT_=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SCRIPT_=\
+NODEP_CPP_RESOURCE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_RESOURCE_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_RESOURCE_=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_RESOURCE_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_RESOURCE_=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT_=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_RESOURCE_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_RESOURCE_=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT_=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_RESOURCE_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_RESOURCE_=\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
 !ENDIF 
@@ -12288,80 +13730,38 @@ NODEP_CPP_SCRIPT_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\script_v2.cpp
+SOURCE=..\..\..\engines\scumm\room.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCRIPT_V=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCRIPT_V=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCRIPT_V=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ROOM_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+NODEP_CPP_ROOM_=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_ROOM_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -12375,328 +13775,399 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\boxes.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_ROOM_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_ROOM_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_ROOM_=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_ROOM_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_ROOM_=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_ROOM_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_ROOM_=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_ROOM_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_ROOM_=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\boxes.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\saveload.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.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"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\script_v5.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SCRIPT_V5=\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SCRIPT_V5=\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCRIPT_V5=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V5=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCRIPT_V5=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V5=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT_V5=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V5=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT_V5=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V5=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\saveload.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ENDIF 
@@ -12704,114 +14175,53 @@ NODEP_CPP_SCRIPT_V5=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\script_v6.cpp
+SOURCE=..\..\..\engines\scumm\saveload.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\script.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCRIPT_V6=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\insane\insane.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCRIPT_V6=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\insane\insane.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCRIPT_V6=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIPT_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V6=\
+NODEP_CPP_SCRIPT_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_V6=\
+DEP_CPP_SCRIPT_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -12820,7 +14230,8 @@ DEP_CPP_SCRIPT_V6=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -12830,37 +14241,21 @@ DEP_CPP_SCRIPT_V6=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V6=\
+NODEP_CPP_SCRIPT_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -12868,276 +14263,164 @@ NODEP_CPP_SCRIPT_V6=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SCRIPT_V6=\
+DEP_CPP_SCRIPT_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V6=\
+NODEP_CPP_SCRIPT_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCRIPT_V6=\
+DEP_CPP_SCRIPT_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V6=\
+NODEP_CPP_SCRIPT_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\script_v6he.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SCRIPT_V6H=\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SCRIPT_V6H=\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT_V6H=\
+DEP_CPP_SCRIPT_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V6H=\
+NODEP_CPP_SCRIPT_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT_V6H=\
+DEP_CPP_SCRIPT_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V6H=\
+NODEP_CPP_SCRIPT_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\script.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\scumm\script_c64.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIPT_C6=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_C6=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_V6H=\
+DEP_CPP_SCRIPT_C6=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -13147,42 +14430,133 @@ DEP_CPP_SCRIPT_V6H=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SCRIPT_V6H=\
+NODEP_CPP_SCRIPT_C6=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SCRIPT_C6=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_C6=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SCRIPT_C6=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_C6=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SCRIPT_C6=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_C6=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT_V6H=\
+DEP_CPP_SCRIPT_C6=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_C6=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\scumm\script_v2.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIPT_V2=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_V2=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_SCRIPT_V2=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -13192,466 +14566,358 @@ DEP_CPP_SCRIPT_V6H=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V6H=\
+NODEP_CPP_SCRIPT_V2=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SCRIPT_V2=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_V2=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SCRIPT_V2=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_V2=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SCRIPT_V2=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_V2=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_SCRIPT_V2=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCRIPT_V2=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\script_v72he.cpp
+SOURCE=..\..\..\engines\scumm\script_v5.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCRIPT_V7=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCRIPT_V7=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCRIPT_V7=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIPT_V5=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V7=\
+NODEP_CPP_SCRIPT_V5=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_V7=\
+DEP_CPP_SCRIPT_V5=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.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"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V7=\
+NODEP_CPP_SCRIPT_V5=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SCRIPT_V7=\
+DEP_CPP_SCRIPT_V5=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V7=\
+NODEP_CPP_SCRIPT_V5=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCRIPT_V7=\
+DEP_CPP_SCRIPT_V5=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V7=\
+NODEP_CPP_SCRIPT_V5=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\script_v7he.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SCRIPT_V7H=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SCRIPT_V7H=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT_V7H=\
+DEP_CPP_SCRIPT_V5=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V7H=\
+NODEP_CPP_SCRIPT_V5=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT_V7H=\
+DEP_CPP_SCRIPT_V5=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V7H=\
+NODEP_CPP_SCRIPT_V5=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\script_v6.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCRIPT_V7H=\
+DEP_CPP_SCRIPT_V6=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V7H=\
+NODEP_CPP_SCRIPT_V6=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_V7H=\
+DEP_CPP_SCRIPT_V6=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -13660,7 +14926,8 @@ DEP_CPP_SCRIPT_V7H=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -13668,306 +14935,212 @@ DEP_CPP_SCRIPT_V7H=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V7H=\
+NODEP_CPP_SCRIPT_V6=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\script_v8.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SCRIPT_V8=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\akos.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SCRIPT_V8=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\akos.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCRIPT_V8=\
+DEP_CPP_SCRIPT_V6=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V8=\
+NODEP_CPP_SCRIPT_V6=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCRIPT_V8=\
+DEP_CPP_SCRIPT_V6=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V8=\
+NODEP_CPP_SCRIPT_V6=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT_V8=\
+DEP_CPP_SCRIPT_V6=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V8=\
+NODEP_CPP_SCRIPT_V6=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT_V8=\
+DEP_CPP_SCRIPT_V6=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V8=\
+NODEP_CPP_SCRIPT_V6=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ENDIF 
@@ -13975,105 +15148,69 @@ NODEP_CPP_SCRIPT_V8=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\script_v80he.cpp
+SOURCE=..\..\..\engines\scumm\script_v8.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCRIPT_V80=\
-	"..\..\..\scumm\common\config-file.h"\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\str.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCRIPT_V80=\
-	"..\..\..\scumm\common\config-file.h"\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\str.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCRIPT_V80=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIPT_V8_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V80=\
+NODEP_CPP_SCRIPT_V8_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_V80=\
+DEP_CPP_SCRIPT_V8_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -14081,454 +15218,410 @@ DEP_CPP_SCRIPT_V80=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\akos.h"\
+	"..\..\..\engines\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V80=\
+NODEP_CPP_SCRIPT_V8_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SCRIPT_V80=\
+DEP_CPP_SCRIPT_V8_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V80=\
+NODEP_CPP_SCRIPT_V8_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCRIPT_V80=\
+DEP_CPP_SCRIPT_V8_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V80=\
+NODEP_CPP_SCRIPT_V8_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\script_v90he.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SCRIPT_V9=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\logic_he.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SCRIPT_V9=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\logic_he.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT_V9=\
+DEP_CPP_SCRIPT_V8_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V9=\
+NODEP_CPP_SCRIPT_V8_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT_V9=\
+DEP_CPP_SCRIPT_V8_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V9=\
+NODEP_CPP_SCRIPT_V8_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE="..\..\..\engines\scumm\scumm-md5.h"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\scumm\scumm.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SCRIPT_V9=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCUMM=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V9=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse\sysex.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_V9=\
+DEP_CPP_SCUMM=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\akos.h"\
+	"..\..\..\engines\scumm\base-costume.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\costume.h"\
+	"..\..\..\engines\scumm\debugger.h"\
+	"..\..\..\engines\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\help.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse\sysex.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\nut_renderer.h"\
+	"..\..\..\engines\scumm\player_mod.h"\
+	"..\..\..\engines\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\smush\chunk.h"\
+	"..\..\..\engines\scumm\smush\codec37.h"\
+	"..\..\..\engines\scumm\smush\codec47.h"\
+	"..\..\..\engines\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\smush\smush_player.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\engines\scumm\verbs.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCRIPT_V9=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\scumm\scumm-md5.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\scumm.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SCUMM=\
-	"..\..\..\scumm\backends\fs\fs.h"\
-	"..\..\..\scumm\base\options.h"\
-	"..\..\..\scumm\base\plugins.h"\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\md5.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\extras\palm-scumm-md5.h"\
-	"..\..\..\scumm\gui\message.h"\
-	"..\..\..\scumm\gui\newgui.h"\
-	"..\..\..\scumm\scumm\akos.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\costume.h"\
-	"..\..\..\scumm\scumm\debugger.h"\
-	"..\..\..\scumm\scumm\dialogs.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\insane\insane.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\logic_he.h"\
-	"..\..\..\scumm\scumm\player_nes.h"\
-	"..\..\..\scumm\scumm\player_v1.h"\
-	"..\..\..\scumm\scumm\player_v2.h"\
-	"..\..\..\scumm\scumm\player_v2a.h"\
-	"..\..\..\scumm\scumm\player_v3a.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm-md5.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SCUMM=\
-	"..\..\..\scumm\backends\fs\fs.h"\
-	"..\..\..\scumm\base\options.h"\
-	"..\..\..\scumm\base\plugins.h"\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\md5.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\extras\palm-scumm-md5.h"\
-	"..\..\..\scumm\gui\message.h"\
-	"..\..\..\scumm\gui\newgui.h"\
-	"..\..\..\scumm\scumm\akos.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\costume.h"\
-	"..\..\..\scumm\scumm\debugger.h"\
-	"..\..\..\scumm\scumm\dialogs.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\insane\insane.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\logic_he.h"\
-	"..\..\..\scumm\scumm\player_nes.h"\
-	"..\..\..\scumm\scumm\player_v1.h"\
-	"..\..\..\scumm\scumm\player_v2.h"\
-	"..\..\..\scumm\scumm\player_v2a.h"\
-	"..\..\..\scumm\scumm\player_v3a.h"\
-	"..\..\..\scumm\scumm\resource_v7he.h"\
-	"..\..\..\scumm\scumm\scumm-md5.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SCUMM=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -14539,88 +15632,67 @@ DEP_CPP_SCUMM=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_nes.h"\
-	"..\..\..\scumm\player_v1.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\player_v2a.h"\
-	"..\..\..\scumm\player_v3a.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm-md5.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_SCUMM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\extras\palm-scumm-md5.h"\
-	"..\..\..\scumm\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse\sysex.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SCUMM=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -14631,80 +15703,53 @@ DEP_CPP_SCUMM=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_nes.h"\
-	"..\..\..\scumm\player_v1.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\player_v2a.h"\
-	"..\..\..\scumm\player_v3a.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm-md5.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCUMM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\extras\palm-scumm-md5.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse\sysex.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SCUMM=\
@@ -14712,15 +15757,13 @@ DEP_CPP_SCUMM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -14731,69 +15774,51 @@ DEP_CPP_SCUMM=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_nes.h"\
-	"..\..\..\scumm\player_v1.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\player_v2a.h"\
-	"..\..\..\scumm\player_v3a.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm-md5.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_SCUMM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\extras\palm-scumm-md5.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse\sysex.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -14803,15 +15828,13 @@ DEP_CPP_SCUMM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -14822,69 +15845,51 @@ DEP_CPP_SCUMM=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\akos.h"\
-	"..\..\..\scumm\base-costume.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\costume.h"\
-	"..\..\..\scumm\debugger.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\insane\insane.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\nut_renderer.h"\
-	"..\..\..\scumm\player_mod.h"\
-	"..\..\..\scumm\player_nes.h"\
-	"..\..\..\scumm\player_v1.h"\
-	"..\..\..\scumm\player_v2.h"\
-	"..\..\..\scumm\player_v2a.h"\
-	"..\..\..\scumm\player_v3a.h"\
-	"..\..\..\scumm\resource_v7he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm-md5.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\smush_player.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_SCUMM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\scumm\extras\palm-scumm-md5.h"\
-	"..\..\..\scumm\scumm_globals.h"\
+	"..\..\..\engines\scumm\scumm\akos.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\costume.h"\
+	"..\..\..\engines\scumm\scumm\debugger.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\animation_he.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\he\resource_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sprite_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse\sysex.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\insane\insane.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\player_nes.h"\
+	"..\..\..\engines\scumm\scumm\player_v1.h"\
+	"..\..\..\engines\scumm\scumm\player_v2.h"\
+	"..\..\..\engines\scumm\scumm\player_v2a.h"\
+	"..\..\..\engines\scumm\scumm\player_v3a.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\smush\smush_mixer.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ENDIF 
@@ -14892,74 +15897,31 @@ NODEP_CPP_SCUMM=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\scumm.h
+SOURCE=..\..\..\engines\scumm\scumm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\sound.cpp
+SOURCE=..\..\..\engines\scumm\sound.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\timer.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\sound\audiocd.h"\
-	"..\..\..\scumm\sound\flac.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	"..\..\..\scumm\sound\mp3.h"\
-	"..\..\..\scumm\sound\voc.h"\
-	"..\..\..\scumm\sound\vorbis.h"\
-	"..\..\..\scumm\sound\wave.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\timer.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\imuse.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\sound\audiocd.h"\
-	"..\..\..\scumm\sound\flac.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	"..\..\..\scumm\sound\mixer.h"\
-	"..\..\..\scumm\sound\mp3.h"\
-	"..\..\..\scumm\sound\voc.h"\
-	"..\..\..\scumm\sound\vorbis.h"\
-	"..\..\..\scumm\sound\wave.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SOUND=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SOUND_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -14967,21 +15929,8 @@ DEP_CPP_SOUND=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
@@ -14990,18 +15939,24 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SOUND=\
+NODEP_CPP_SOUND_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SOUND=\
+DEP_CPP_SOUND_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -15010,7 +15965,8 @@ DEP_CPP_SOUND=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -15020,19 +15976,22 @@ DEP_CPP_SOUND=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
@@ -15042,9 +16001,8 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\voc.h"\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SOUND=\
+NODEP_CPP_SOUND_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -15052,28 +16010,17 @@ NODEP_CPP_SOUND=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SOUND=\
+DEP_CPP_SOUND_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -15081,21 +16028,8 @@ DEP_CPP_SOUND=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
@@ -15104,28 +16038,32 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SOUND=\
+NODEP_CPP_SOUND_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SOUND=\
+DEP_CPP_SOUND_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -15133,21 +16071,8 @@ DEP_CPP_SOUND=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\util.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
@@ -15156,247 +16081,160 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SOUND=\
+NODEP_CPP_SOUND_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\sprite_he.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SPRIT=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sprite_he.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SPRIT=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\saveload.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sprite_he.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SPRIT=\
+DEP_CPP_SOUND_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SPRIT=\
+NODEP_CPP_SOUND_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SPRIT=\
+DEP_CPP_SOUND_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SPRIT=\
+NODEP_CPP_SOUND_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\imuse\imuse.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\sound.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\sound.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\scumm\string.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SPRIT=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	
-NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SPRIT=\
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_STRIN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\saveload.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_SPRIT=\
+NODEP_CPP_STRIN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\sprite_he.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\string.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_STRIN=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\dialogs.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_STRIN=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\dialogs.h"\
-	"..\..\..\scumm\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\sound.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -15404,10 +16242,13 @@ DEP_CPP_STRIN=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -15416,7 +16257,30 @@ DEP_CPP_STRIN=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\file.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\help.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"\
+	"..\..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\music.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\sound.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
@@ -15427,160 +16291,117 @@ DEP_CPP_STRIN=\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\options.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_STRIN=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_STRIN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
@@ -15589,57 +16410,31 @@ DEP_CPP_STRIN=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\dialogs.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\help.h"\
-	"..\..\..\scumm\imuse_digi\dimuse.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_bndmgr.h"\
-	"..\..\..\scumm\imuse_digi\dimuse_sndmgr.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\music.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sound.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\util.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\dialogs.h"\
+	"..\..\..\engines\scumm\scumm\file.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\sound_he.h"\
+	"..\..\..\engines\scumm\scumm\imuse_digi\dimuse.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ENDIF 
@@ -15647,63 +16442,44 @@ NODEP_CPP_STRIN=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\thumbnail.cpp
+SOURCE=..\..\..\engines\scumm\thumbnail.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_THUMB=\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\scaler.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_THUMB=\
-	"..\..\..\scumm\common\savefile.h"\
-	"..\..\..\scumm\common\scaler.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\common\system.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
 DEP_CPP_THUMB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.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\util.h"\
+	"..\..\..\graphics\scaler.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
 NODEP_CPP_THUMB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
 DEP_CPP_THUMB=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -15716,193 +16492,165 @@ DEP_CPP_THUMB=\
 	"..\..\..\common\mutex.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"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\scaler.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_THUMB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
 DEP_CPP_THUMB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.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\util.h"\
+	"..\..\..\graphics\scaler.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
 NODEP_CPP_THUMB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_THUMB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.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\util.h"\
+	"..\..\..\graphics\scaler.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
 NODEP_CPP_THUMB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\usage_bits.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_USAGE=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_USAGE=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\usage_bits.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_USAGE=\
+DEP_CPP_THUMB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\graphics\scaler.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\usage_bits.h"\
 	
-NODEP_CPP_USAGE=\
+NODEP_CPP_THUMB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_USAGE=\
+DEP_CPP_THUMB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\graphics\scaler.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\usage_bits.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_USAGE=\
+NODEP_CPP_THUMB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\usage_bits.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_USAGE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_USAGE=\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
 DEP_CPP_USAGE=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -15912,52 +16660,76 @@ DEP_CPP_USAGE=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\usage_bits.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\usage_bits.h"\
+	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_USAGE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_USAGE=\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_USAGE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_USAGE=\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_USAGE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_USAGE=\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
 DEP_CPP_USAGE=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\usage_bits.h"\
 	
 NODEP_CPP_USAGE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\usage_bits.h"\
 	
 
 !ENDIF 
@@ -15965,70 +16737,49 @@ NODEP_CPP_USAGE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\usage_bits.h
+SOURCE=..\..\..\engines\scumm\usage_bits.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\util.cpp
+SOURCE=..\..\..\engines\scumm\util.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_UTIL_=\
-	"..\..\..\scumm\common\md5.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_UTIL_=\
-	"..\..\..\scumm\common\md5.h"\
-	"..\..\..\scumm\common\util.h"\
-	"..\..\..\scumm\scumm\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
 DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\util.h"\
 	
 NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
 DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\scumm\util.h"\
 	
 NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
@@ -16037,60 +16788,72 @@ NODEP_CPP_UTIL_=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_UTIL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_UTIL_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_UTIL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_UTIL_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\util.h"\
 	
 NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
 DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\util.h"\
 	
 NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\util.h"\
 	
 
 !ENDIF 
@@ -16098,63 +16861,37 @@ NODEP_CPP_UTIL_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\util.h
+SOURCE=..\..\..\engines\scumm\util.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\vars.cpp
+SOURCE=..\..\..\engines\scumm\vars.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_VARS_=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\logic_he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_VARS_=\
-	"..\..\..\scumm\common\config-manager.h"\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\logic_he.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\sound\mididrv.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
 DEP_CPP_VARS_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_VARS_=\
@@ -16163,10 +16900,13 @@ NODEP_CPP_VARS_=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
 DEP_CPP_VARS_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -16177,7 +16917,8 @@ DEP_CPP_VARS_=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -16187,16 +16928,17 @@ DEP_CPP_VARS_=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\he\floodfill_he.h"\
+	"..\..\..\engines\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\he\wiz_he.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\..\common\config.h"\
@@ -16206,43 +16948,23 @@ NODEP_CPP_VARS_=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
 DEP_CPP_VARS_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_VARS_=\
@@ -16251,37 +16973,29 @@ NODEP_CPP_VARS_=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_VARS_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\logic_he.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_VARS_=\
@@ -16290,160 +17004,107 @@ NODEP_CPP_VARS_=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\verbs.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_VERBS=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_VERBS=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\actor.h"\
-	"..\..\..\scumm\scumm\charset.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\object.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\verbs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_VERBS=\
+DEP_CPP_VARS_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_VERBS=\
+NODEP_CPP_VARS_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_VERBS=\
+DEP_CPP_VARS_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_VERBS=\
+NODEP_CPP_VARS_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\he\intern_he.h"\
+	"..\..\..\engines\scumm\scumm\he\logic_he.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\scumm\verbs.cpp
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
 DEP_CPP_VERBS=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
 NODEP_CPP_VERBS=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
 DEP_CPP_VERBS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -16453,199 +17114,102 @@ DEP_CPP_VERBS=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\actor.h"\
+	"..\..\..\engines\scumm\charset.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\intern.h"\
+	"..\..\..\engines\scumm\object.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\resource.h"\
+	"..\..\..\engines\scumm\saveload.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\engines\scumm\verbs.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\actor.h"\
-	"..\..\..\scumm\charset.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\object.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\verbs.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\verbs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\wiz_he.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_WIZ_H=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_WIZ_H=\
-	"..\..\..\scumm\common\stdafx.h"\
-	"..\..\..\scumm\scumm\intern.h"\
-	"..\..\..\scumm\scumm\resource.h"\
-	"..\..\..\scumm\scumm\scumm.h"\
-	"..\..\..\scumm\scumm\wiz_he.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_WIZ_H=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_VERBS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_WIZ_H=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
+NODEP_CPP_VERBS=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_WIZ_H=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_VERBS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_WIZ_H=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_VERBS=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_WIZ_H=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_VERBS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_WIZ_H=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_VERBS=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_WIZ_H=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_VERBS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\intern.h"\
-	"..\..\..\scumm\resource.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\sprite_he.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
-NODEP_CPP_WIZ_H=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_VERBS=\
+	"..\..\..\engines\scumm\scumm\actor.h"\
+	"..\..\..\engines\scumm\scumm\charset.h"\
+	"..\..\..\engines\scumm\scumm\intern.h"\
+	"..\..\..\engines\scumm\scumm\object.h"\
+	"..\..\..\engines\scumm\scumm\resource.h"\
+	"..\..\..\engines\scumm\scumm\scumm.h"\
+	"..\..\..\engines\scumm\scumm\verbs.h"\
 	
 
 !ENDIF 
@@ -16653,7 +17217,7 @@ NODEP_CPP_WIZ_H=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\wiz_he.h
+SOURCE=..\..\..\engines\scumm\verbs.h
 # End Source File
 # End Group
 # Begin Group "Header Files"
diff --git a/dists/msevc4/scummvm/scummvm.vcp b/dists/msevc4/scummvm/scummvm.vcp
index 6752000c21..85f9ec1679 100644
--- a/dists/msevc4/scummvm/scummvm.vcp
+++ b/dists/msevc4/scummvm/scummvm.vcp
@@ -55,21 +55,21 @@ CFG=scummvm - Win32 (WCE emulator) Debug
 # PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /O2 /c
-# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /O2 /c
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
 # ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /O2 /c
+# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /O2 /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
@@ -87,21 +87,21 @@ LINK32=link.exe
 # PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
-# ADD RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
 # ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
@@ -120,21 +120,21 @@ LINK32=link.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /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 _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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /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
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 # ADD LINK32 commctrl.lib coredll.lib aygshell.lib mad.lib sdl.lib LibTremorCE.lib libmpeg2.lib zlib.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /out:"bin/ARMV4Rel/PocketSCUMM.exe" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /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 _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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
@@ -153,22 +153,22 @@ LINK32=link.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /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 "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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /FR /YX /M$(CECrtMTDebug) /c
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 # ADD LINK32 commctrl.lib coredll.lib aygshell.lib mad.lib sdl.lib LibTremorCE.lib libmpeg2.lib zlib.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 # SUBTRACT LINK32 /pdb:none
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /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 "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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /FR /YX /M$(CECrtMTDebug) /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
@@ -225,7 +225,8 @@ 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 /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_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /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" /I "../../../engines" /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_TREMOR" /D "USE_VORBIS" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /D "DISABLE_AGI" /D "DISABLE_CINE" /D "DISABLE_LURE" /D "DISABLE_FANCY_THEMES" /YX /Oxs /M$(CECrtMT) /c
+# SUBTRACT CPP /Fr
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -356,8 +357,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
 CPP=shcl.exe
-# 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" /YX /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxs /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" /D "USE_ZLIB" /YX /M$(CECrtMT) /c
+# 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" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /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
@@ -393,145 +394,128 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\2xsai.cpp
+SOURCE=..\..\..\graphics\scaler\2xsai.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_2XSAI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
 DEP_CPP_2XSAI=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_2XSAI=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_2XSAI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_2XSAI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_2XSAI=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_2XSAI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_2XSAI=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_2XSAI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_2XSAI=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_2XSAI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_2XSAI=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 DEP_CPP_2XSAI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_2XSAI=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -539,314 +523,299 @@ NODEP_CPP_2XSAI=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\aspect.cpp
+SOURCE=..\..\..\graphics\scaler\aspect.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\scaler\common\scaler.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\scaler\common\scaler.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
 DEP_CPP_ASPEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_ASPEC=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_ASPEC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ASPEC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ASPEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_ASPEC=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ASPEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_ASPEC=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ASPEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_ASPEC=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 DEP_CPP_ASPEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_ASPEC=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_ASPEC=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_ASPEC=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
-!ENDIF 
+!ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\hq2x.cpp
+SOURCE=..\..\..\graphics\scaler\hq2x.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\scaler\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\scaler\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_HQ2X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
 DEP_CPP_HQ2X_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq2x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ2X_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HQ2X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_HQ2X_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq2x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ2X_=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_HQ2X_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq2x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ2X_=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_HQ2X_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq2x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ2X_=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_HQ2X_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq2x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ2X_=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 DEP_CPP_HQ2X_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq2x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ2X_=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -854,159 +823,138 @@ NODEP_CPP_HQ2X_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\hq2x.h
+SOURCE=..\..\..\graphics\scaler\hq2x.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\hq3x.cpp
+SOURCE=..\..\..\graphics\scaler\hq3x.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\scaler\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\scaler\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_HQ3X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
 DEP_CPP_HQ3X_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq3x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ3X_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HQ3X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_HQ3X_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq3x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ3X_=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_HQ3X_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq3x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ3X_=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_HQ3X_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq3x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ3X_=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_HQ3X_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq3x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ3X_=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 DEP_CPP_HQ3X_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\hq3x.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	
 NODEP_CPP_HQ3X_=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -1014,177 +962,142 @@ NODEP_CPP_HQ3X_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\hq3x.h
+SOURCE=..\..\..\graphics\scaler\hq3x.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\intern.h
+SOURCE=../../../graphics/scaler/intern.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\scale2x.cpp
+SOURCE=..\..\..\graphics\scaler\scale2x.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SCALE=\
-	"..\..\..\common\scaler\scale2x.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SCALE=\
-	"..\..\..\common\scaler\scale2x.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCALE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SCALE=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SCALE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
 	
 NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_SCALE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
 	
 NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SCALE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
 	
 NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SCALE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
 	
 NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SCALE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
 	
 NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 DEP_CPP_SCALE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
 	
 NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -1192,173 +1105,138 @@ NODEP_CPP_SCALE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\scale2x.h
+SOURCE=..\..\..\graphics\scaler\scale2x.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\scale3x.cpp
+SOURCE=..\..\..\graphics\scaler\scale3x.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SCALE3=\
-	"..\..\..\common\scaler\scale3x.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SCALE3=\
-	"..\..\..\common\scaler\scale3x.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
 DEP_CPP_SCALE3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALE3=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_SCALE3=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALE3=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_SCALE3=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-DEP_CPP_SCALE3=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SCALE3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SCALE3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SCALE3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 DEP_CPP_SCALE3=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -1366,183 +1244,144 @@ NODEP_CPP_SCALE3=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\scale3x.h
+SOURCE=..\..\..\graphics\scaler\scale3x.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\scalebit.cpp
+SOURCE=..\..\..\graphics\scaler\scalebit.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SCALEB=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_SCALEB=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SCALEB=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SCALEB=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SCALEB=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 DEP_CPP_SCALEB=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scale2x.h"\
+	"..\..\..\graphics\scaler\scale3x.h"\
 	
 NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -1550,112 +1389,150 @@ NODEP_CPP_SCALEB=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\scalebit.h
+SOURCE=..\..\..\graphics\scaler\scalebit.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler\thumbnail.cpp
+SOURCE=..\..\..\graphics\scaler\thumbnail.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_THUMB=\
-	"..\..\..\common\scaler\common\scaler.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	"..\..\..\common\scaler\common\scummsys.h"\
-	"..\..\..\common\scaler\common\stdafx.h"\
-	"..\..\..\common\scaler\common\system.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_THUMB=\
-	"..\..\..\common\scaler\common\scaler.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	"..\..\..\common\scaler\common\scummsys.h"\
-	"..\..\..\common\scaler\common\stdafx.h"\
-	"..\..\..\common\scaler\common\system.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
 DEP_CPP_THUMB=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_THUMB=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_THUMB=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_THUMB=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_THUMB=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_THUMB=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_THUMB=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_THUMB=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_THUMB=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_THUMB=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
@@ -1665,22 +1542,24 @@ NODEP_CPP_THUMB=\
 
 DEP_CPP_THUMB=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_THUMB=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
@@ -1728,7 +1607,6 @@ DEP_CPP_CONFI=\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -1740,6 +1618,7 @@ NODEP_CPP_CONFI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -1755,32 +1634,24 @@ DEP_CPP_CONFI=\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONFI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
 DEP_CPP_CONFI=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1788,15 +1659,19 @@ DEP_CPP_CONFI=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
 NODEP_CPP_CONFI=\
@@ -1806,51 +1681,172 @@ NODEP_CPP_CONFI=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_CONFI=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
 NODEP_CPP_CONFI=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\common\config-file.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\common\config-manager.cpp"
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-NODEP_CPP_CONFIG=\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\file.h"\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\util.h"\
+DEP_CPP_CONFI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CONFI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CONFI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CONFI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CONFI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CONFI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CONFI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CONFI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\common\config-file.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\common\config-manager.cpp"
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_CONFIG=\
+	"..\..\..\common\common\config-manager.h"\
+	"..\..\..\common\common\file.h"\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
@@ -1872,7 +1868,6 @@ DEP_CPP_CONFIG=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -1884,6 +1879,7 @@ NODEP_CPP_CONFIG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -1897,30 +1893,123 @@ DEP_CPP_CONFIG=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONFIG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
+DEP_CPP_CONFIG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CONFIG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
+DEP_CPP_CONFIG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CONFIG=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_CONFIG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CONFIG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_CONFIG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_CONFIG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_CONFIG=\
@@ -1931,7 +2020,6 @@ DEP_CPP_CONFIG=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -1943,6 +2031,7 @@ NODEP_CPP_CONFIG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -1956,7 +2045,6 @@ DEP_CPP_CONFIG=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -1968,6 +2056,7 @@ NODEP_CPP_CONFIG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -2060,32 +2149,29 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -2093,6 +2179,7 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
@@ -2102,6 +2189,7 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_DEBUG=\
@@ -2111,15 +2199,22 @@ NODEP_CPP_DEBUG=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -2127,6 +2222,7 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
@@ -2136,113 +2232,125 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\debugger.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-SOURCE=..\..\..\common\endian.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\file.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_FILE_=\
-	"..\..\..\common\common\file.h"\
-	"..\..\..\common\common\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_FILE_=\
-	"..\..\..\common\common\file.h"\
-	"..\..\..\common\common\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_FILE_=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_FILE_=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_FILE_=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_FILE_=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_FILE_=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_FILE_=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -2251,20 +2359,32 @@ NODEP_CPP_FILE_=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_FILE_=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_FILE_=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -2276,53 +2396,46 @@ NODEP_CPP_FILE_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\file.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\list.h
+SOURCE=..\..\..\common\debugger.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\map.h
+SOURCE=..\..\..\common\endian.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\md5.cpp
+SOURCE=..\..\..\common\file.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MD5_C=\
+NODEP_CPP_FILE_=\
 	"..\..\..\common\common\file.h"\
-	"..\..\..\common\common\md5.h"\
 	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MD5_C=\
+NODEP_CPP_FILE_=\
 	"..\..\..\common\common\file.h"\
-	"..\..\..\common\common\md5.h"\
 	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_MD5_C=\
+DEP_CPP_FILE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_MD5_C=\
+NODEP_CPP_FILE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -2331,178 +2444,144 @@ NODEP_CPP_MD5_C=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_MD5_C=\
+DEP_CPP_FILE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MD5_C=\
+NODEP_CPP_FILE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_MD5_C=\
+DEP_CPP_FILE_=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\md5.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_MD5_C=\
+NODEP_CPP_FILE_=\
 	"..\..\..\common\config.h"\
+	"..\..\..\common\CoreFoundation\CoreFoundation.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MD5_C=\
+DEP_CPP_FILE_=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\md5.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_MD5_C=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_FILE_=\
+	"..\..\..\common\CoreFoundation\CoreFoundation.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\md5.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\mutex.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MUTEX=\
-	"..\..\..\common\common\mutex.h"\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\system.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MUTEX=\
-	"..\..\..\common\common\mutex.h"\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\system.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MUTEX=\
+DEP_CPP_FILE_=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_MUTEX=\
+NODEP_CPP_FILE_=\
 	"..\..\..\common\config.h"\
+	"..\..\..\common\CoreFoundation\CoreFoundation.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MUTEX=\
+DEP_CPP_FILE_=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MUTEX=\
+NODEP_CPP_FILE_=\
 	"..\..\..\common\config.h"\
+	"..\..\..\common\CoreFoundation\CoreFoundation.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MUTEX=\
+DEP_CPP_FILE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_MUTEX=\
+NODEP_CPP_FILE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -2511,20 +2590,20 @@ NODEP_CPP_MUTEX=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MUTEX=\
+DEP_CPP_FILE_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_MUTEX=\
+NODEP_CPP_FILE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -2536,115 +2615,129 @@ NODEP_CPP_MUTEX=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\mutex.h
+SOURCE=..\..\..\common\file.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\rect.h
+SOURCE=..\..\..\common\func.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\savefile.cpp
+SOURCE=..\..\..\common\hashmap.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SAVEF=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_HASHM=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_HASHM=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SAVEF=\
+DEP_CPP_HASHM=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"zlib.h"\
-	{$(INCLUDE)}"ZLIB\zconf.h"\
 	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_HASHM=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_HASHM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_HASHM=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_HASHM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_HASHM=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SAVEF=\
+DEP_CPP_HASHM=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_HASHM=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
@@ -2652,24 +2745,21 @@ NODEP_CPP_SAVEF=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SAVEF=\
+DEP_CPP_HASHM=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_HASHM=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
@@ -2680,42 +2770,49 @@ NODEP_CPP_SAVEF=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\savefile.h
+SOURCE=..\..\..\common\hashmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\common\list.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\scaler.cpp
+SOURCE=..\..\..\common\md5.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCALER=\
-	"..\..\..\common\common\scaler\intern.h"\
-	"..\..\..\common\common\scaler\scalebit.h"\
+NODEP_CPP_MD5_C=\
+	"..\..\..\common\common\file.h"\
+	"..\..\..\common\common\md5.h"\
 	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCALER=\
-	"..\..\..\common\common\scaler\intern.h"\
-	"..\..\..\common\common\scaler\scalebit.h"\
+NODEP_CPP_MD5_C=\
+	"..\..\..\common\common\file.h"\
+	"..\..\..\common\common\md5.h"\
 	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCALER=\
+DEP_CPP_MD5_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scalebit.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_SCALER=\
+NODEP_CPP_MD5_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -2724,174 +2821,138 @@ NODEP_CPP_SCALER=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SCALER=\
+DEP_CPP_MD5_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scalebit.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCALER=\
+NODEP_CPP_MD5_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SCALER=\
+DEP_CPP_MD5_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scalebit.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_SCALER=\
+NODEP_CPP_MD5_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCALER=\
+DEP_CPP_MD5_C=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scalebit.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_SCALER=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MD5_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\scaler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\scummsys.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\singleton.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\stack.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\stdafx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\str.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_STR_C=\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\str.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_STR_C=\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\str.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_STR_C=\
+DEP_CPP_MD5_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_STR_C=\
+NODEP_CPP_MD5_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_STR_C=\
+DEP_CPP_MD5_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_STR_C=\
+NODEP_CPP_MD5_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_STR_C=\
+DEP_CPP_MD5_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_STR_C=\
+NODEP_CPP_MD5_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -2900,17 +2961,21 @@ NODEP_CPP_STR_C=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_STR_C=\
+DEP_CPP_MD5_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_STR_C=\
+NODEP_CPP_MD5_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -2922,42 +2987,44 @@ NODEP_CPP_STR_C=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\str.h
+SOURCE=..\..\..\common\md5.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\stream.cpp
+SOURCE=..\..\..\common\mutex.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_STREA=\
+NODEP_CPP_MUTEX=\
+	"..\..\..\common\common\mutex.h"\
 	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\str.h"\
-	"..\..\..\common\common\stream.h"\
+	"..\..\..\common\common\system.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_STREA=\
+NODEP_CPP_MUTEX=\
+	"..\..\..\common\common\mutex.h"\
 	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\str.h"\
-	"..\..\..\common\common\stream.h"\
+	"..\..\..\common\common\system.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_STREA=\
+DEP_CPP_MUTEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_STREA=\
+NODEP_CPP_MUTEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -2966,221 +3033,132 @@ NODEP_CPP_STREA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_STREA=\
+DEP_CPP_MUTEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_STREA=\
+NODEP_CPP_MUTEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_STREA=\
+DEP_CPP_MUTEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_STREA=\
+NODEP_CPP_MUTEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_STREA=\
+DEP_CPP_MUTEX=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_STREA=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MUTEX=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\system.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SYSTE=\
-	"..\..\..\common\backends\intern.h"\
-	"..\..\..\common\base\options.h"\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\system.h"\
-	"..\..\..\common\common\util.h"\
-	"..\..\..\common\gui\message.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SYSTE=\
-	"..\..\..\common\backends\intern.h"\
-	"..\..\..\common\base\options.h"\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\system.h"\
-	"..\..\..\common\common\util.h"\
-	"..\..\..\common\gui\message.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_MUTEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_SYSTE=\
+NODEP_CPP_MUTEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_MUTEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SYSTE=\
+NODEP_CPP_MUTEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_MUTEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_SYSTE=\
+NODEP_CPP_MUTEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -3189,34 +3167,20 @@ NODEP_CPP_SYSTE=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_MUTEX=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_SYSTE=\
+NODEP_CPP_MUTEX=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -3228,254 +3192,237 @@ NODEP_CPP_SYSTE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\system.h
+SOURCE=..\..\..\common\mutex.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\timer.cpp
+SOURCE=..\..\..\common\rect.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\common\savefile.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_TIMER=\
-	"..\..\..\common\common\scummsys.h"\
+NODEP_CPP_SAVEF=\
+	"..\..\..\common\common\config-manager.h"\
+	"..\..\..\common\common\savefile.h"\
 	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\system.h"\
-	"..\..\..\common\common\timer.h"\
 	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_TIMER=\
-	"..\..\..\common\common\scummsys.h"\
+NODEP_CPP_SAVEF=\
+	"..\..\..\common\common\config-manager.h"\
+	"..\..\..\common\common\savefile.h"\
 	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\system.h"\
-	"..\..\..\common\common\timer.h"\
 	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_TIMER=\
+DEP_CPP_SAVEF=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_TIMER=\
+NODEP_CPP_SAVEF=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_TIMER=\
+DEP_CPP_SAVEF=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_TIMER=\
+NODEP_CPP_SAVEF=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	".\lib.h"\
+	".\LIB\zconf.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_TIMER=\
+DEP_CPP_SAVEF=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_TIMER=\
+NODEP_CPP_SAVEF=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_TIMER=\
+DEP_CPP_SAVEF=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_TIMER=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SAVEF=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\util.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_UTIL_=\
-	"..\..\..\common\base\engine.h"\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_UTIL_=\
-	"..\..\..\common\base\engine.h"\
-	"..\..\..\common\common\stdafx.h"\
-	"..\..\..\common\common\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_UTIL_=\
+DEP_CPP_SAVEF=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_UTIL_=\
+NODEP_CPP_SAVEF=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_UTIL_=\
+DEP_CPP_SAVEF=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_UTIL_=\
+NODEP_CPP_SAVEF=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_UTIL_=\
+DEP_CPP_SAVEF=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_UTIL_=\
+NODEP_CPP_SAVEF=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_UTIL_=\
+DEP_CPP_SAVEF=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_UTIL_=\
+NODEP_CPP_SAVEF=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -3484,307 +3431,233 @@ NODEP_CPP_UTIL_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\util.h
+SOURCE=..\..\..\common\savefile.h
 # End Source File
-# End Group
-# Begin Group "sound"
+# Begin Source File
 
-# PROP Default_Filter ""
-# Begin Group "softsynth"
+SOURCE=..\..\..\common\scummsys.h
+# End Source File
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=..\..\..\common\singleton.h
+# End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\softsynth\adlib.cpp
+SOURCE=..\..\..\common\stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\common\stdafx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\common\str.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ADLIB=\
-	"..\..\..\sound\softsynth\common\util.h"\
-	"..\..\..\sound\softsynth\sound\fmopl.h"\
-	"..\..\..\sound\softsynth\sound\softsynth\emumidi.h"\
+NODEP_CPP_STR_C=\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\str.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ADLIB=\
-	"..\..\..\sound\softsynth\common\util.h"\
-	"..\..\..\sound\softsynth\sound\fmopl.h"\
-	"..\..\..\sound\softsynth\sound\softsynth\emumidi.h"\
+NODEP_CPP_STR_C=\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\str.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ADLIB=\
+DEP_CPP_STR_C=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\softsynth\emumidi.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_ADLIB=\
+NODEP_CPP_STR_C=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_ADLIB=\
+DEP_CPP_STR_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\softsynth\emumidi.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_ADLIB=\
+NODEP_CPP_STR_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_ADLIB=\
+DEP_CPP_STR_C=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\softsynth\emumidi.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_ADLIB=\
+NODEP_CPP_STR_C=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ADLIB=\
+DEP_CPP_STR_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\softsynth\emumidi.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_ADLIB=\
+NODEP_CPP_STR_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\softsynth\emumidi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\softsynth\ym2612.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-NODEP_CPP_YM261=\
-	"..\..\..\sound\softsynth\common\util.h"\
-	"..\..\..\sound\softsynth\sound\softsynth\emumidi.h"\
+DEP_CPP_STR_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_YM261=\
-	"..\..\..\sound\softsynth\common\util.h"\
-	"..\..\..\sound\softsynth\sound\softsynth\emumidi.h"\
+NODEP_CPP_STR_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_YM261=\
+DEP_CPP_STR_C=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\softsynth\emumidi.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_YM261=\
+NODEP_CPP_STR_C=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_YM261=\
+DEP_CPP_STR_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\softsynth\emumidi.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_YM261=\
+NODEP_CPP_STR_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_YM261=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\softsynth\emumidi.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_YM261=\
+DEP_CPP_STR_C=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\softsynth\emumidi.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_YM261=\
+NODEP_CPP_STR_C=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
 
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=..\..\..\sound\adpcm.cpp
+SOURCE=..\..\..\common\str.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\common\stream.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ADPCM=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\stream.h"\
-	"..\..\..\sound\sound\adpcm.h"\
-	"..\..\..\sound\sound\audiostream.h"\
+NODEP_CPP_STREA=\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\str.h"\
+	"..\..\..\common\common\stream.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ADPCM=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\stream.h"\
-	"..\..\..\sound\sound\adpcm.h"\
-	"..\..\..\sound\sound\audiostream.h"\
+NODEP_CPP_STREA=\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\str.h"\
+	"..\..\..\common\common\stream.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ADPCM=\
+DEP_CPP_STREA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\adpcm.h"\
-	"..\..\..\sound\audiostream.h"\
 	
-NODEP_CPP_ADPCM=\
+NODEP_CPP_STREA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -3793,214 +3666,116 @@ NODEP_CPP_ADPCM=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_ADPCM=\
+DEP_CPP_STREA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\adpcm.h"\
-	"..\..\..\sound\audiostream.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_ADPCM=\
+NODEP_CPP_STREA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_ADPCM=\
+DEP_CPP_STREA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\adpcm.h"\
-	"..\..\..\sound\audiostream.h"\
 	
-NODEP_CPP_ADPCM=\
+NODEP_CPP_STREA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ADPCM=\
+DEP_CPP_STREA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\adpcm.h"\
-	"..\..\..\sound\audiostream.h"\
 	
-NODEP_CPP_ADPCM=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_STREA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\adpcm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\audiocd.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_AUDIO=\
-	"..\..\..\sound\base\engine.h"\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\flac.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\sound\vorbis.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_AUDIO=\
-	"..\..\..\sound\base\engine.h"\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\flac.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\sound\vorbis.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_STREA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_STREA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_STREA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_STREA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_STREA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_STREA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -4009,30 +3784,18 @@ NODEP_CPP_AUDIO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_STREA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_STREA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -4044,318 +3807,321 @@ NODEP_CPP_AUDIO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\audiocd.h
+SOURCE=..\..\..\common\stream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\audiostream.cpp
+SOURCE=..\..\..\common\system.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_AUDIOS=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\flac.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\sound\vorbis.h"\
+NODEP_CPP_SYSTE=\
+	"..\..\..\common\backends\intern.h"\
+	"..\..\..\common\base\options.h"\
+	"..\..\..\common\common\config-manager.h"\
+	"..\..\..\common\common\savefile.h"\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\system.h"\
+	"..\..\..\common\common\util.h"\
+	"..\..\..\common\gui\message.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_AUDIOS=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\flac.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\sound\vorbis.h"\
+NODEP_CPP_SYSTE=\
+	"..\..\..\common\backends\intern.h"\
+	"..\..\..\common\base\options.h"\
+	"..\..\..\common\common\config-manager.h"\
+	"..\..\..\common\common\savefile.h"\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\system.h"\
+	"..\..\..\common\common\util.h"\
+	"..\..\..\common\gui\message.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_AUDIOS=\
+DEP_CPP_SYSTE=\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_AUDIOS=\
+NODEP_CPP_SYSTE=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_AUDIOS=\
+DEP_CPP_SYSTE=\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_AUDIOS=\
+NODEP_CPP_SYSTE=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_AUDIOS=\
+DEP_CPP_SYSTE=\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_AUDIOS=\
+NODEP_CPP_SYSTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_AUDIOS=\
+DEP_CPP_SYSTE=\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_AUDIOS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SYSTE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\audiostream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\flac.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_FLAC_=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\flac.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_FLAC_=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\flac.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_FLAC_=\
+DEP_CPP_SYSTE=\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_FLAC_=\
+NODEP_CPP_SYSTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\LAC\export.h"\
-	".\LAC\format.h"\
-	".\LAC\ordinals.h"\
-	".\LAC\seekable_stream_decoder.h"\
-	".\LAC\stream_decoder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_FLAC_=\
+DEP_CPP_SYSTE=\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"FLAC\export.h"\
-	{$(INCLUDE)}"FLAC\format.h"\
-	{$(INCLUDE)}"FLAC\ordinals.h"\
-	{$(INCLUDE)}"FLAC\seekable_stream_decoder.h"\
-	{$(INCLUDE)}"FLAC\stream_decoder.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_FLAC_=\
+NODEP_CPP_SYSTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_FLAC_=\
+DEP_CPP_SYSTE=\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_FLAC_=\
+NODEP_CPP_SYSTE=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_FLAC_=\
+DEP_CPP_SYSTE=\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_FLAC_=\
+NODEP_CPP_SYSTE=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -4364,201 +4130,147 @@ NODEP_CPP_FLAC_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\flac.h
+SOURCE=..\..\..\common\system.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\fmopl.cpp
+SOURCE=..\..\..\common\timer.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_FMOPL=\
-	"..\..\..\sound\arm\macros.h"\
-	"..\..\..\sound\arm\native.h"\
-	"..\..\..\sound\common\config-manager.h"\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\fmopl.h"\
+NODEP_CPP_TIMER=\
+	"..\..\..\common\common\scummsys.h"\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\system.h"\
+	"..\..\..\common\common\timer.h"\
+	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_FMOPL=\
-	"..\..\..\sound\arm\macros.h"\
-	"..\..\..\sound\arm\native.h"\
-	"..\..\..\sound\common\config-manager.h"\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\fmopl.h"\
+NODEP_CPP_TIMER=\
+	"..\..\..\common\common\scummsys.h"\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\system.h"\
+	"..\..\..\common\common\timer.h"\
+	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_FMOPL=\
+DEP_CPP_TIMER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_FMOPL=\
+NODEP_CPP_TIMER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sound\arm\macros.h"\
-	"..\..\..\sound\arm\native.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_FMOPL=\
+DEP_CPP_TIMER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\fmopl.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_FMOPL=\
+NODEP_CPP_TIMER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sound\arm\macros.h"\
-	"..\..\..\sound\arm\native.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_FMOPL=\
+DEP_CPP_TIMER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_FMOPL=\
+NODEP_CPP_TIMER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sound\arm\macros.h"\
-	"..\..\..\sound\arm\native.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_FMOPL=\
+DEP_CPP_TIMER=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_FMOPL=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_TIMER=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sound\arm\macros.h"\
-	"..\..\..\sound\arm\native.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\fmopl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\mididrv.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MIDID=\
-	"..\..\..\sound\base\engine.h"\
-	"..\..\..\sound\common\config-manager.h"\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\str.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\mididrv.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MIDID=\
-	"..\..\..\sound\base\engine.h"\
-	"..\..\..\sound\common\config-manager.h"\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\str.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\mididrv.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MIDID=\
+DEP_CPP_TIMER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_MIDID=\
+NODEP_CPP_TIMER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -4566,28 +4278,23 @@ NODEP_CPP_MIDID=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MIDID=\
+DEP_CPP_TIMER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MIDID=\
+NODEP_CPP_TIMER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -4595,35 +4302,23 @@ NODEP_CPP_MIDID=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDID=\
+DEP_CPP_TIMER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_MIDID=\
+NODEP_CPP_TIMER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -4633,25 +4328,21 @@ NODEP_CPP_MIDID=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDID=\
+DEP_CPP_TIMER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_MIDID=\
+NODEP_CPP_TIMER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -4664,128 +4355,161 @@ NODEP_CPP_MIDID=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\mididrv.h
+SOURCE=..\..\..\common\timer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\midiparser.cpp
+SOURCE=..\..\..\common\unzip.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MIDIP=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\mididrv.h"\
-	"..\..\..\sound\sound\midiparser.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MIDIP=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\mididrv.h"\
-	"..\..\..\sound\sound\midiparser.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_MIDIP=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_UNZIP=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\unzip.h"\
 	
-NODEP_CPP_MIDIP=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_UNZIP=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIDIP=\
+DEP_CPP_UNZIP=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\unzip.h"\
 	
-NODEP_CPP_MIDIP=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_UNZIP=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_UNZIP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\unzip.h"\
+	
+NODEP_CPP_UNZIP=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_UNZIP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\unzip.h"\
+	
+NODEP_CPP_UNZIP=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDIP=\
+DEP_CPP_UNZIP=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\unzip.h"\
 	
-NODEP_CPP_MIDIP=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_UNZIP=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDIP=\
+DEP_CPP_UNZIP=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\unzip.h"\
 	
-NODEP_CPP_MIDIP=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_UNZIP=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -4794,254 +4518,191 @@ NODEP_CPP_MIDIP=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\midiparser.h
+SOURCE=..\..\..\common\unzip.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\midiparser_smf.cpp
+SOURCE=..\..\..\common\util.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MIDIPA=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\mididrv.h"\
-	"..\..\..\sound\sound\midiparser.h"\
+NODEP_CPP_UTIL_=\
+	"..\..\..\common\base\engine.h"\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MIDIPA=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\mididrv.h"\
-	"..\..\..\sound\sound\midiparser.h"\
+NODEP_CPP_UTIL_=\
+	"..\..\..\common\base\engine.h"\
+	"..\..\..\common\common\stdafx.h"\
+	"..\..\..\common\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_MIDIPA=\
+DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIPA=\
+NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_MIDIPA=\
+DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MIDIPA=\
+NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_MIDIPA=\
+DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIPA=\
+NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIDIPA=\
+DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIPA=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_UTIL_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\midiparser_xmidi.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MIDIPAR=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\mididrv.h"\
-	"..\..\..\sound\sound\midiparser.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MIDIPAR=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\mididrv.h"\
-	"..\..\..\sound\sound\midiparser.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MIDIPAR=\
+DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIPAR=\
+NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MIDIPAR=\
+DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MIDIPAR=\
+NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDIPAR=\
+DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIPAR=\
+NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDIPAR=\
+DEP_CPP_UTIL_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIPAR=\
+NODEP_CPP_UTIL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -5050,330 +4711,239 @@ NODEP_CPP_MIDIPAR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\mixer.cpp
+SOURCE=..\..\..\common\util.h
+# End Source File
+# End Group
+# Begin Group "sound"
+
+# PROP Default_Filter ""
+# Begin Group "softsynth"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\sound\softsynth\adlib.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MIXER=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\flac.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\sound\rate.h"\
-	"..\..\..\sound\sound\vorbis.h"\
+NODEP_CPP_ADLIB=\
+	"..\..\..\sound\softsynth\common\util.h"\
+	"..\..\..\sound\softsynth\sound\fmopl.h"\
+	"..\..\..\sound\softsynth\sound\softsynth\emumidi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MIXER=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\flac.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\sound\rate.h"\
-	"..\..\..\sound\sound\vorbis.h"\
+NODEP_CPP_ADLIB=\
+	"..\..\..\sound\softsynth\common\util.h"\
+	"..\..\..\sound\softsynth\sound\fmopl.h"\
+	"..\..\..\sound\softsynth\sound\softsynth\emumidi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_MIXER=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_ADLIB=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MIXER=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ADLIB=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\config.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_MIXER=\
+DEP_CPP_ADLIB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MIXER=\
+NODEP_CPP_ADLIB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_MIXER=\
+DEP_CPP_ADLIB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MIXER=\
+NODEP_CPP_ADLIB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIXER=\
+DEP_CPP_ADLIB=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MIXER=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ADLIB=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\mixer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\mp3.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MP3_C=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MP3_C=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MP3_C=\
+DEP_CPP_ADLIB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MP3_C=\
+NODEP_CPP_ADLIB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MP3_C=\
+DEP_CPP_ADLIB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MP3_C=\
+NODEP_CPP_ADLIB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MP3_C=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_ADLIB=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MP3_C=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ADLIB=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\config.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MP3_C=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_ADLIB=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MP3_C=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ADLIB=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\config.h"\
 	
 
 !ENDIF 
@@ -5381,56 +4951,52 @@ NODEP_CPP_MP3_C=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\mp3.h
+SOURCE=..\..\..\sound\softsynth\emumidi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\mpu401.cpp
+SOURCE=..\..\..\sound\softsynth\ym2612.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MPU40=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\mpu401.h"\
+NODEP_CPP_YM261=\
+	"..\..\..\sound\softsynth\common\util.h"\
+	"..\..\..\sound\softsynth\sound\softsynth\emumidi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MPU40=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\mpu401.h"\
+NODEP_CPP_YM261=\
+	"..\..\..\sound\softsynth\common\util.h"\
+	"..\..\..\sound\softsynth\sound\softsynth\emumidi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_MPU40=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_YM261=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MPU40=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_YM261=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\config.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_MPU40=\
+DEP_CPP_YM261=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
@@ -5440,42 +5006,39 @@ DEP_CPP_MPU40=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MPU40=\
+NODEP_CPP_YM261=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_MPU40=\
+DEP_CPP_YM261=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MPU40=\
+NODEP_CPP_YM261=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -5483,219 +5046,170 @@ NODEP_CPP_MPU40=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MPU40=\
+DEP_CPP_YM261=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_MPU40=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_YM261=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\mpu401.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\rate.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RATE_=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\rate.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RATE_=\
-	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\rate.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_RATE_=\
+DEP_CPP_YM261=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_RATE_=\
+NODEP_CPP_YM261=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_RATE_=\
+DEP_CPP_YM261=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_RATE_=\
+NODEP_CPP_YM261=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_RATE_=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_YM261=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_RATE_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_YM261=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\config.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_RATE_=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_YM261=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_RATE_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_YM261=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\config.h"\
 	
 
 !ENDIF 
 
 # End Source File
+# End Group
 # Begin Source File
 
-SOURCE=..\..\..\sound\rate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\voc.cpp
+SOURCE=..\..\..\sound\adpcm.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_VOC_C=\
+NODEP_CPP_ADPCM=\
 	"..\..\..\sound\common\stdafx.h"\
 	"..\..\..\sound\common\stream.h"\
-	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\adpcm.h"\
 	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\voc.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_VOC_C=\
+NODEP_CPP_ADPCM=\
 	"..\..\..\sound\common\stdafx.h"\
 	"..\..\..\sound\common\stream.h"\
-	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\adpcm.h"\
 	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\voc.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_VOC_C=\
+DEP_CPP_ADPCM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
 	
-NODEP_CPP_VOC_C=\
+NODEP_CPP_ADPCM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -5704,210 +5218,134 @@ NODEP_CPP_VOC_C=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_VOC_C=\
+DEP_CPP_ADPCM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_VOC_C=\
+NODEP_CPP_ADPCM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_VOC_C=\
+DEP_CPP_ADPCM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
 	
-NODEP_CPP_VOC_C=\
+NODEP_CPP_ADPCM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_VOC_C=\
+DEP_CPP_ADPCM=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
 	
-NODEP_CPP_VOC_C=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ADPCM=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\voc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\vorbis.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_VORBI=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\vorbis.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_VORBI=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\vorbis.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_VORBI=\
+DEP_CPP_ADPCM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_VORBI=\
+NODEP_CPP_ADPCM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_VORBI=\
+DEP_CPP_ADPCM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"tremor\ivorbisfile.h"\
-	{$(INCLUDE)}"TREMOR\tremor\config_types.h"\
-	{$(INCLUDE)}"TREMOR\tremor\ivorbiscodec.h"\
-	{$(INCLUDE)}"TREMOR\tremor\ogg.h"\
-	{$(INCLUDE)}"TREMOR\tremor\os_types.h"\
-	{$(INCLUDE)}"TREMOR\vorbis\config_types.h"\
-	{$(INCLUDE)}"TREMOR\vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"TREMOR\vorbis\ogg.h"\
-	{$(INCLUDE)}"TREMOR\vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
-NODEP_CPP_VORBI=\
+NODEP_CPP_ADPCM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_VORBI=\
+DEP_CPP_ADPCM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_VORBI=\
+NODEP_CPP_ADPCM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -5916,26 +5354,19 @@ NODEP_CPP_VORBI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_VORBI=\
+DEP_CPP_ADPCM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_VORBI=\
+NODEP_CPP_ADPCM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -5947,54 +5378,66 @@ NODEP_CPP_VORBI=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\vorbis.h
+SOURCE=..\..\..\sound\adpcm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\wave.cpp
+SOURCE=..\..\..\sound\audiocd.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_WAVE_=\
+NODEP_CPP_AUDIO=\
+	"..\..\..\sound\base\engine.h"\
+	"..\..\..\sound\common\file.h"\
 	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\stream.h"\
+	"..\..\..\sound\common\system.h"\
 	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\adpcm.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\wave.h"\
+	"..\..\..\sound\sound\audiocd.h"\
+	"..\..\..\sound\sound\flac.h"\
+	"..\..\..\sound\sound\mp3.h"\
+	"..\..\..\sound\sound\vorbis.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_WAVE_=\
+NODEP_CPP_AUDIO=\
+	"..\..\..\sound\base\engine.h"\
+	"..\..\..\sound\common\file.h"\
 	"..\..\..\sound\common\stdafx.h"\
-	"..\..\..\sound\common\stream.h"\
+	"..\..\..\sound\common\system.h"\
 	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\adpcm.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\wave.h"\
+	"..\..\..\sound\sound\audiocd.h"\
+	"..\..\..\sound\sound\flac.h"\
+	"..\..\..\sound\sound\mp3.h"\
+	"..\..\..\sound\sound\vorbis.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_WAVE_=\
+DEP_CPP_AUDIO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\adpcm.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_WAVE_=\
+NODEP_CPP_AUDIO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -6003,239 +5446,188 @@ NODEP_CPP_WAVE_=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_WAVE_=\
+DEP_CPP_AUDIO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\adpcm.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_WAVE_=\
+NODEP_CPP_AUDIO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_WAVE_=\
+DEP_CPP_AUDIO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\adpcm.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_WAVE_=\
+NODEP_CPP_AUDIO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_WAVE_=\
+DEP_CPP_AUDIO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\adpcm.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_WAVE_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_AUDIO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sound\wave.h
-# End Source File
-# End Group
-# Begin Group "gui"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\gui\about.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ABOUT=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\about.h"\
-	"..\..\..\gui\gui\credits.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ABOUT=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\about.h"\
-	"..\..\..\gui\gui\credits.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_ABOUT=\
+DEP_CPP_AUDIO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\credits.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_ABOUT=\
+NODEP_CPP_AUDIO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ABOUT=\
+DEP_CPP_AUDIO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\credits.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_ABOUT=\
+NODEP_CPP_AUDIO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ABOUT=\
+DEP_CPP_AUDIO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\credits.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_ABOUT=\
+NODEP_CPP_AUDIO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -6244,34 +5636,30 @@ NODEP_CPP_ABOUT=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ABOUT=\
+DEP_CPP_AUDIO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\credits.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_ABOUT=\
+NODEP_CPP_AUDIO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -6283,469 +5671,230 @@ NODEP_CPP_ABOUT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\about.h
+SOURCE=..\..\..\sound\audiocd.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\Actions.cpp
+SOURCE=..\..\..\sound\audiostream.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ACTIO=\
-	"..\..\..\gui\backends\epoc\SymbianActions.h"\
-	"..\..\..\gui\backends\wince\CEActionsPocket.h"\
-	"..\..\..\gui\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\gui\common\config-manager.h"\
-	"..\..\..\gui\gui\Actions.h"\
-	"..\..\..\gui\gui\message.h"\
-	"..\..\..\gui\scumm\scumm.h"\
-	"..\..\..\gui\stdafx.h"\
+NODEP_CPP_AUDIOS=\
+	"..\..\..\sound\common\file.h"\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\flac.h"\
+	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\mp3.h"\
+	"..\..\..\sound\sound\vorbis.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ACTIO=\
-	"..\..\..\gui\backends\epoc\SymbianActions.h"\
-	"..\..\..\gui\backends\wince\CEActionsPocket.h"\
-	"..\..\..\gui\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\gui\common\config-manager.h"\
-	"..\..\..\gui\gui\Actions.h"\
-	"..\..\..\gui\gui\message.h"\
-	"..\..\..\gui\scumm\scumm.h"\
-	"..\..\..\gui\stdafx.h"\
+NODEP_CPP_AUDIOS=\
+	"..\..\..\sound\common\file.h"\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\flac.h"\
+	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\mp3.h"\
+	"..\..\..\sound\sound\vorbis.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ACTIO=\
-	"..\..\..\backends\epoc\SymbianActions.h"\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_AUDIOS=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_ACTIO=\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
+NODEP_CPP_AUDIOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_ACTIO=\
-	"..\..\..\backends\epoc\SymbianActions.h"\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_AUDIOS=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_ACTIO=\
+NODEP_CPP_AUDIOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_ACTIO=\
-	"..\..\..\backends\epoc\SymbianActions.h"\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_AUDIOS=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_ACTIO=\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
+NODEP_CPP_AUDIOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ACTIO=\
-	"..\..\..\backends\epoc\SymbianActions.h"\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_AUDIOS=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_ACTIO=\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\common\config.h"\
+NODEP_CPP_AUDIOS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\Actions.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\browser.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_BROWS=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_BROWS=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_BROWS=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_AUDIOS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_BROWS=\
+NODEP_CPP_AUDIOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_BROWS=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_AUDIOS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_BROWS=\
+NODEP_CPP_AUDIOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_BROWS=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_AUDIOS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_BROWS=\
+NODEP_CPP_AUDIOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -6754,34 +5903,26 @@ NODEP_CPP_BROWS=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_BROWS=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_AUDIOS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_BROWS=\
+NODEP_CPP_AUDIOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -6793,327 +5934,235 @@ NODEP_CPP_BROWS=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\browser.h
+SOURCE=..\..\..\sound\audiostream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\chooser.cpp
+SOURCE=..\..\..\sound\flac.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CHOOS=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+NODEP_CPP_FLAC_=\
+	"..\..\..\sound\common\file.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiocd.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\flac.h"\
+	
 
-NODEP_CPP_CHOOS=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_FLAC_=\
+	"..\..\..\sound\common\file.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiocd.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\flac.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_CHOOS=\
+DEP_CPP_FLAC_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CHOOS=\
+NODEP_CPP_FLAC_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\LAC\export.h"\
+	".\LAC\format.h"\
+	".\LAC\ordinals.h"\
+	".\LAC\seekable_stream_decoder.h"\
+	".\LAC\stream_decoder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_CHOOS=\
+DEP_CPP_FLAC_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CHOOS=\
+NODEP_CPP_FLAC_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	".\LAC\export.h"\
+	".\LAC\format.h"\
+	".\LAC\ordinals.h"\
+	".\LAC\seekable_stream_decoder.h"\
+	".\LAC\stream_decoder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CHOOS=\
+DEP_CPP_FLAC_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CHOOS=\
+NODEP_CPP_FLAC_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CHOOS=\
+DEP_CPP_FLAC_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\FLAC\export.h"\
+	"..\..\..\backends\wince\missing\FLAC\format.h"\
+	"..\..\..\backends\wince\missing\FLAC\ordinals.h"\
+	"..\..\..\backends\wince\missing\FLAC\seekable_stream_decoder.h"\
+	"..\..\..\backends\wince\missing\FLAC\stream_decoder.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CHOOS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_FLAC_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\chooser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\console.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_CONSO=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\graphics\font.h"\
-	"..\..\..\gui\gui\console.h"\
-	"..\..\..\gui\gui\ScrollBarWidget.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_CONSO=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\graphics\font.h"\
-	"..\..\..\gui\gui\console.h"\
-	"..\..\..\gui\gui\ScrollBarWidget.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CONSO=\
+DEP_CPP_FLAC_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_FLAC_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CONSO=\
+DEP_CPP_FLAC_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_FLAC_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CONSO=\
+DEP_CPP_FLAC_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_FLAC_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -7122,34 +6171,26 @@ NODEP_CPP_CONSO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CONSO=\
+DEP_CPP_FLAC_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_FLAC_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -7161,333 +6202,234 @@ NODEP_CPP_CONSO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\console.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\credits.h
+SOURCE=..\..\..\sound\flac.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\dialog.cpp
+SOURCE=..\..\..\sound\fmopl.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_DIALO=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\gui\widget.h"\
+NODEP_CPP_FMOPL=\
+	"..\..\..\sound\arm\macros.h"\
+	"..\..\..\sound\arm\native.h"\
+	"..\..\..\sound\common\config-manager.h"\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\fmopl.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_DIALO=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\gui\widget.h"\
+NODEP_CPP_FMOPL=\
+	"..\..\..\sound\arm\macros.h"\
+	"..\..\..\sound\arm\native.h"\
+	"..\..\..\sound\common\config-manager.h"\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\fmopl.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_DIALO=\
+DEP_CPP_FMOPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_DIALO=\
+NODEP_CPP_FMOPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\sound\arm\macros.h"\
+	"..\..\..\sound\arm\native.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_DIALO=\
+DEP_CPP_FMOPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_DIALO=\
+NODEP_CPP_FMOPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\sound\arm\macros.h"\
+	"..\..\..\sound\arm\native.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_DIALO=\
+DEP_CPP_FMOPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_DIALO=\
+NODEP_CPP_FMOPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_DIALO=\
+DEP_CPP_FMOPL=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_DIALO=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_FMOPL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\dialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\editable.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_EDITA=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\gui\editable.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_EDITA=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\gui\editable.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_EDITA=\
+DEP_CPP_FMOPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_EDITA=\
+NODEP_CPP_FMOPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_EDITA=\
+DEP_CPP_FMOPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_EDITA=\
+NODEP_CPP_FMOPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_EDITA=\
+DEP_CPP_FMOPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_EDITA=\
+NODEP_CPP_FMOPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\sound\arm\macros.h"\
+	"..\..\..\sound\arm\native.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_EDITA=\
+DEP_CPP_FMOPL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_EDITA=\
+NODEP_CPP_FMOPL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\sound\arm\macros.h"\
+	"..\..\..\sound\arm\native.h"\
 	
 
 !ENDIF 
@@ -7495,290 +6437,257 @@ NODEP_CPP_EDITA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\editable.h
+SOURCE=..\..\..\sound\fmopl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\EditTextWidget.cpp
+SOURCE=..\..\..\sound\mididrv.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_EDITT=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\EditTextWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
+NODEP_CPP_MIDID=\
+	"..\..\..\sound\base\engine.h"\
+	"..\..\..\sound\common\config-manager.h"\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\str.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\mididrv.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_EDITT=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\EditTextWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
+NODEP_CPP_MIDID=\
+	"..\..\..\sound\base\engine.h"\
+	"..\..\..\sound\common\config-manager.h"\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\str.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\mididrv.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_EDITT=\
+DEP_CPP_MIDID=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_EDITT=\
+NODEP_CPP_MIDID=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_EDITT=\
+DEP_CPP_MIDID=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_EDITT=\
+NODEP_CPP_MIDID=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_EDITT=\
+DEP_CPP_MIDID=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_EDITT=\
+NODEP_CPP_MIDID=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_EDITT=\
+DEP_CPP_MIDID=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_EDITT=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MIDID=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\EditTextWidget.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\Key.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_KEY_C=\
-	"..\..\..\gui\gui\Key.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_KEY_C=\
-	"..\..\..\gui\gui\Key.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_KEY_C=\
+DEP_CPP_MIDID=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\Key.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_KEY_C=\
+NODEP_CPP_MIDID=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_KEY_C=\
+DEP_CPP_MIDID=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\Key.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_KEY_C=\
+NODEP_CPP_MIDID=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_KEY_C=\
+DEP_CPP_MIDID=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\Key.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_KEY_C=\
+NODEP_CPP_MIDID=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_KEY_C=\
+DEP_CPP_MIDID=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\Key.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_KEY_C=\
+NODEP_CPP_MIDID=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -7787,312 +6696,146 @@ NODEP_CPP_KEY_C=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\Key.h
+SOURCE=..\..\..\sound\mididrv.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\KeysDialog.cpp
+SOURCE=..\..\..\sound\midiparser.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_KEYSD=\
-	"..\..\..\gui\CEDevice.h"\
-	"..\..\..\gui\gui\Actions.h"\
-	"..\..\..\gui\gui\KeysDialog.h"\
-	"..\..\..\gui\stdafx.h"\
+NODEP_CPP_MIDIP=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\mididrv.h"\
+	"..\..\..\sound\sound\midiparser.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_KEYSD=\
-	"..\..\..\gui\CEDevice.h"\
-	"..\..\..\gui\gui\Actions.h"\
-	"..\..\..\gui\gui\KeysDialog.h"\
-	"..\..\..\gui\stdafx.h"\
+NODEP_CPP_MIDIP=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\mididrv.h"\
+	"..\..\..\sound\sound\midiparser.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_KEYSD=\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_KEYSD=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_KEYSD=\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_KEYSD=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_KEYSD=\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_KEYSD=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_KEYSD=\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_KEYSD=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\KeysDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\launcher.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_LAUNC=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\options.h"\
-	"..\..\..\gui\base\plugins.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\common\config-manager.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\about.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\EditTextWidget.h"\
-	"..\..\..\gui\gui\launcher.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\message.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\options.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
-	"..\..\..\gui\sound\mididrv.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_LAUNC=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\options.h"\
-	"..\..\..\gui\base\plugins.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\common\config-manager.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\about.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\EditTextWidget.h"\
-	"..\..\..\gui\gui\launcher.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\message.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\options.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
-	"..\..\..\gui\sound\mididrv.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_LAUNC=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_LAUNC=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -8100,54 +6843,24 @@ NODEP_CPP_LAUNC=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_LAUNC=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_LAUNC=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -8155,61 +6868,22 @@ NODEP_CPP_LAUNC=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_LAUNC=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_LAUNC=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -8219,51 +6893,20 @@ NODEP_CPP_LAUNC=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_LAUNC=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_LAUNC=\
+NODEP_CPP_MIDIP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -8276,344 +6919,221 @@ NODEP_CPP_LAUNC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\launcher.h
+SOURCE=..\..\..\sound\midiparser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\ListWidget.cpp
+SOURCE=..\..\..\sound\midiparser_smf.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_LISTW=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\ScrollBarWidget.h"\
+NODEP_CPP_MIDIPA=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\mididrv.h"\
+	"..\..\..\sound\sound\midiparser.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_LISTW=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\ScrollBarWidget.h"\
+NODEP_CPP_MIDIPA=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\mididrv.h"\
+	"..\..\..\sound\sound\midiparser.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_LISTW=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_LISTW=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_LISTW=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_LISTW=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_LISTW=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_LISTW=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_LISTW=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_LISTW=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\ListWidget.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\message.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MESSA=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\str.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\message.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MESSA=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\str.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\message.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MESSA=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MESSA=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MESSA=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MESSA=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MESSA=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MESSA=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MESSA=\
+DEP_CPP_MIDIPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MESSA=\
+NODEP_CPP_MIDIPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
@@ -8622,322 +7142,167 @@ NODEP_CPP_MESSA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\message.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\newgui.cpp
+SOURCE=..\..\..\sound\midiparser_xmidi.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_NEWGU=\
-	"..\..\..\gui\arm\macros.h"\
-	"..\..\..\gui\arm\native.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
+NODEP_CPP_MIDIPAR=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\mididrv.h"\
+	"..\..\..\sound\sound\midiparser.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_NEWGU=\
-	"..\..\..\gui\arm\macros.h"\
-	"..\..\..\gui\arm\native.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
+NODEP_CPP_MIDIPAR=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\mididrv.h"\
+	"..\..\..\sound\sound\midiparser.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_NEWGU=\
+DEP_CPP_MIDIPAR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_NEWGU=\
+NODEP_CPP_MIDIPAR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\gui\arm\macros.h"\
-	"..\..\..\gui\arm\native.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_NEWGU=\
+DEP_CPP_MIDIPAR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_NEWGU=\
+NODEP_CPP_MIDIPAR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\gui\arm\macros.h"\
-	"..\..\..\gui\arm\native.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_NEWGU=\
+DEP_CPP_MIDIPAR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_NEWGU=\
+NODEP_CPP_MIDIPAR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\gui\arm\macros.h"\
-	"..\..\..\gui\arm\native.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_NEWGU=\
+DEP_CPP_MIDIPAR=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_NEWGU=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MIDIPAR=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\gui\arm\macros.h"\
-	"..\..\..\gui\arm\native.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\newgui.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\object.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-SOURCE=..\..\..\gui\options.cpp
+DEP_CPP_MIDIPAR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	
+NODEP_CPP_MIDIPAR=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
 
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-NODEP_CPP_OPTIO=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\common\config-manager.h"\
-	"..\..\..\gui\common\scaler.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\options.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
-	"..\..\..\gui\sound\mididrv.h"\
-	"..\..\..\gui\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_OPTIO=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\common\config-manager.h"\
-	"..\..\..\gui\common\scaler.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\options.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
-	"..\..\..\gui\sound\mididrv.h"\
-	"..\..\..\gui\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_OPTIO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_OPTIO=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_OPTIO=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_MIDIPAR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_OPTIO=\
+NODEP_CPP_MIDIPAR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -8945,55 +7310,22 @@ NODEP_CPP_OPTIO=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_OPTIO=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_MIDIPAR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_OPTIO=\
+NODEP_CPP_MIDIPAR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -9003,45 +7335,20 @@ NODEP_CPP_OPTIO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_OPTIO=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_MIDIPAR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_OPTIO=\
+NODEP_CPP_MIDIPAR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -9054,62 +7361,65 @@ NODEP_CPP_OPTIO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\options.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\PopUpWidget.cpp
+SOURCE=..\..\..\sound\mixer.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_POPUP=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
+NODEP_CPP_MIXER=\
+	"..\..\..\sound\common\file.h"\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\system.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\flac.h"\
+	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\mp3.h"\
+	"..\..\..\sound\sound\rate.h"\
+	"..\..\..\sound\sound\vorbis.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_POPUP=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
+NODEP_CPP_MIXER=\
+	"..\..\..\sound\common\file.h"\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\system.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\flac.h"\
+	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\mp3.h"\
+	"..\..\..\sound\sound\rate.h"\
+	"..\..\..\sound\sound\vorbis.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_POPUP=\
+DEP_CPP_MIXER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_POPUP=\
+NODEP_CPP_MIXER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -9118,246 +7428,190 @@ NODEP_CPP_POPUP=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_POPUP=\
+DEP_CPP_MIXER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_POPUP=\
+NODEP_CPP_MIXER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_POPUP=\
+DEP_CPP_MIXER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_POPUP=\
+NODEP_CPP_MIXER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_POPUP=\
+DEP_CPP_MIXER=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_POPUP=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MIXER=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\PopUpWidget.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\ScrollBarWidget.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-DEP_CPP_SCROL=\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	
-NODEP_CPP_SCROL=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-DEP_CPP_SCROL=\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	
-NODEP_CPP_SCROL=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCROL=\
+DEP_CPP_MIXER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_MIXER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCROL=\
+DEP_CPP_MIXER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_MIXER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCROL=\
+DEP_CPP_MIXER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_MIXER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -9366,29 +7620,31 @@ NODEP_CPP_SCROL=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCROL=\
+DEP_CPP_MIXER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_MIXER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -9400,57 +7656,54 @@ NODEP_CPP_SCROL=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\ScrollBarWidget.h
+SOURCE=..\..\..\sound\mixer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\TabWidget.cpp
+SOURCE=..\..\..\sound\mp3.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_TABWI=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
+NODEP_CPP_MP3_C=\
+	"..\..\..\sound\common\file.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiocd.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\mp3.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_TABWI=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
+NODEP_CPP_MP3_C=\
+	"..\..\..\sound\common\file.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiocd.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\mp3.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_TABWI=\
+DEP_CPP_MP3_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
 	
-NODEP_CPP_TABWI=\
+NODEP_CPP_MP3_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -9459,232 +7712,166 @@ NODEP_CPP_TABWI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_TABWI=\
+DEP_CPP_MP3_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
 	
-NODEP_CPP_TABWI=\
+NODEP_CPP_MP3_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_TABWI=\
+DEP_CPP_MP3_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
 	
-NODEP_CPP_TABWI=\
+NODEP_CPP_MP3_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_TABWI=\
+DEP_CPP_MP3_C=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mad.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
 	
-NODEP_CPP_TABWI=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MP3_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\TabWidget.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\gui\widget.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_WIDGE=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\graphics\fontman.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_WIDGE=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\graphics\fontman.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_WIDGE=\
+DEP_CPP_MP3_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
 	
-NODEP_CPP_WIDGE=\
+NODEP_CPP_MP3_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_WIDGE=\
+DEP_CPP_MP3_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
 	
-NODEP_CPP_WIDGE=\
+NODEP_CPP_MP3_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_WIDGE=\
+DEP_CPP_MP3_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
 	
-NODEP_CPP_WIDGE=\
+NODEP_CPP_MP3_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -9693,28 +7880,26 @@ NODEP_CPP_WIDGE=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_WIDGE=\
+DEP_CPP_MP3_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
 	
-NODEP_CPP_WIDGE=\
+NODEP_CPP_MP3_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
@@ -9726,461 +7911,942 @@ NODEP_CPP_WIDGE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gui\widget.h
+SOURCE=..\..\..\sound\mp3.h
 # End Source File
-# End Group
-# Begin Group "backends"
-
-# PROP Default_Filter ""
-# Begin Group "wince"
-
-# PROP Default_Filter ""
-# Begin Group "missing"
-
-# PROP Default_Filter ""
-# Begin Group "sys"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\missing\sys\stat.h
+SOURCE=..\..\..\sound\mpu401.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
+NODEP_CPP_MPU40=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\timer.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\mpu401.h"\
+	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+NODEP_CPP_MPU40=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\timer.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\mpu401.h"\
+	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\missing\sys\time.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_MPU40=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_MPU40=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_MPU40=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_MPU40=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
+DEP_CPP_MPU40=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_MPU40=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
+DEP_CPP_MPU40=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_MPU40=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_MPU40=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_MPU40=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_MPU40=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_MPU40=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
+DEP_CPP_MPU40=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_MPU40=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
+DEP_CPP_MPU40=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_MPU40=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\missing\sys\types.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
+SOURCE=..\..\..\sound\mpu401.h
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\missing\assert.h
+SOURCE=..\..\..\sound\rate.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+NODEP_CPP_RATE_=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\rate.h"\
+	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+NODEP_CPP_RATE_=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\rate.h"\
+	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\missing\conio.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_RATE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
+	
+NODEP_CPP_RATE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_RATE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
+	
+NODEP_CPP_RATE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
+DEP_CPP_RATE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
+	
+NODEP_CPP_RATE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
+DEP_CPP_RATE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
+	
+NODEP_CPP_RATE_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_RATE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
+	
+NODEP_CPP_RATE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_RATE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
+	
+NODEP_CPP_RATE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
+DEP_CPP_RATE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
+	
+NODEP_CPP_RATE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
+DEP_CPP_RATE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\rate.h"\
+	
+NODEP_CPP_RATE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\missing\dir.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
+SOURCE=..\..\..\sound\rate.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\missing\direct.h
+SOURCE=..\..\..\sound\voc.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
+NODEP_CPP_VOC_C=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\stream.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\voc.h"\
+	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+NODEP_CPP_VOC_C=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\stream.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\voc.h"\
+	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\missing\dirent.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_VOC_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\voc.h"\
+	
+NODEP_CPP_VOC_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_VOC_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\voc.h"\
+	
+NODEP_CPP_VOC_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
+DEP_CPP_VOC_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\voc.h"\
+	
+NODEP_CPP_VOC_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
+DEP_CPP_VOC_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\voc.h"\
+	
+NODEP_CPP_VOC_C=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_VOC_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\voc.h"\
+	
+NODEP_CPP_VOC_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_VOC_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\voc.h"\
+	
+NODEP_CPP_VOC_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
+DEP_CPP_VOC_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\voc.h"\
+	
+NODEP_CPP_VOC_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
+DEP_CPP_VOC_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\voc.h"\
+	
+NODEP_CPP_VOC_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\missing\errno.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
+SOURCE=..\..\..\sound\voc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\missing\fcntl.h
+SOURCE=..\..\..\sound\vorbis.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+NODEP_CPP_VORBI=\
+	"..\..\..\sound\common\file.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiocd.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\vorbis.h"\
+	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+NODEP_CPP_VORBI=\
+	"..\..\..\sound\common\file.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiocd.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\vorbis.h"\
+	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\missing\io.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\missing\missing.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
+DEP_CPP_VORBI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_VORBI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
+DEP_CPP_VORBI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_VORBI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	".\orbis\vorbisfile.h"\
+	".\remor\ivorbisfile.h"\
+	".\REMOR\tremor\config_types.h"\
+	".\REMOR\tremor\ivorbiscodec.h"\
+	".\REMOR\tremor\ogg.h"\
+	".\REMOR\tremor\os_types.h"\
+	".\REMOR\vorbis\config_types.h"\
+	".\REMOR\vorbis\ivorbiscodec.h"\
+	".\REMOR\vorbis\ogg.h"\
+	".\REMOR\vorbis\os_types.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
+DEP_CPP_VORBI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
+NODEP_CPP_VORBI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
+DEP_CPP_VORBI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\config_types.h"\
+	"..\..\..\backends\wince\missing\ivorbiscodec.h"\
+	"..\..\..\backends\wince\missing\ogg.h"\
+	"..\..\..\backends\wince\missing\os_types.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\tremor\ivorbisfile.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_VORBI=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
+DEP_CPP_VORBI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
+NODEP_CPP_VORBI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
+DEP_CPP_VORBI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
+NODEP_CPP_VORBI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
+DEP_CPP_VORBI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\vorbis.h"\
 	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
+NODEP_CPP_VORBI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
+DEP_CPP_VORBI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_VORBI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -10188,474 +8854,232 @@ NODEP_CPP_MISSI=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\missing\signal.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
+SOURCE=..\..\..\sound\vorbis.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\missing\time.h
+SOURCE=..\..\..\sound\wave.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\missing\unistd.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+NODEP_CPP_WAVE_=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\stream.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\adpcm.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\wave.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "CEgui"
-
-# PROP Default_Filter ""
-# Begin Group "generic"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\CEgui\GUIElement.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
+NODEP_CPP_WAVE_=\
+	"..\..\..\sound\common\stdafx.h"\
+	"..\..\..\sound\common\stream.h"\
+	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\adpcm.h"\
+	"..\..\..\sound\sound\audiostream.h"\
+	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\wave.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_WAVE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
+NODEP_CPP_WAVE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_WAVE_=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_GUIEL=\
+NODEP_CPP_WAVE_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
+	"..\..\..\common\palmversion.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 ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_GUIEL=\
+DEP_CPP_WAVE_=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_GUIEL=\
+NODEP_CPP_WAVE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"
-
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_WAVE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_GUIEL=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_WAVE_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_WAVE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"\
+NODEP_CPP_WAVE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_WAVE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"\
+NODEP_CPP_WAVE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_WAVE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"\
+NODEP_CPP_WAVE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_WAVE_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"\
+NODEP_CPP_WAVE_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -10663,427 +9087,8577 @@ NODEP_CPP_GUIEL=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\GUIElement.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
+SOURCE=..\..\..\sound\wave.h
 # End Source File
+# End Group
+# Begin Group "gui"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\Panel.cpp
+SOURCE=..\..\..\gui\about.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
+NODEP_CPP_ABOUT=\
+	"..\..\..\gui\base\engine.h"\
+	"..\..\..\gui\base\version.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\common\util.h"\
+	"..\..\..\gui\gui\about.h"\
+	"..\..\..\gui\gui\credits.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\widget.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
+NODEP_CPP_ABOUT=\
+	"..\..\..\gui\base\engine.h"\
+	"..\..\..\gui\base\version.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\common\util.h"\
+	"..\..\..\gui\gui\about.h"\
+	"..\..\..\gui\gui\credits.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\widget.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_ABOUT=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\credits.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_PANEL=\
+NODEP_CPP_ABOUT=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_PANEL=\
+DEP_CPP_ABOUT=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\credits.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_PANEL=\
+NODEP_CPP_ABOUT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_ABOUT=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\credits.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ABOUT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_ABOUT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\credits.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ABOUT=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_ABOUT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\credits.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"\
+NODEP_CPP_ABOUT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_ABOUT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\credits.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"\
+NODEP_CPP_ABOUT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_ABOUT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\credits.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ABOUT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_ABOUT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\credits.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ABOUT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\about.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\Actions.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_ACTIO=\
+	"..\..\..\gui\backends\epoc\SymbianActions.h"\
+	"..\..\..\gui\backends\wince\CEActionsPocket.h"\
+	"..\..\..\gui\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\gui\common\config-manager.h"\
+	"..\..\..\gui\gui\Actions.h"\
+	"..\..\..\gui\gui\message.h"\
+	"..\..\..\gui\scumm\scumm.h"\
+	"..\..\..\gui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_ACTIO=\
+	"..\..\..\gui\backends\epoc\SymbianActions.h"\
+	"..\..\..\gui\backends\wince\CEActionsPocket.h"\
+	"..\..\..\gui\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\gui\common\config-manager.h"\
+	"..\..\..\gui\gui\Actions.h"\
+	"..\..\..\gui\gui\message.h"\
+	"..\..\..\gui\scumm\scumm.h"\
+	"..\..\..\gui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_ACTIO=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ACTIO=\
+	"..\..\..\backends\epoc\SymbianActions.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_ACTIO=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ACTIO=\
+	"..\..\..\backends\epoc\SymbianActions.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ACTIO=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\symbian\src\SymbianActions.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ACTIO=\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\gui\scumm\scumm.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_ACTIO=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\symbian\src\SymbianActions.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.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"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	{$(INCLUDE)}"gx.h"\
+	
+NODEP_CPP_ACTIO=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_ACTIO=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\symbian\src\SymbianActions.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ACTIO=\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\gui\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_ACTIO=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\symbian\src\SymbianActions.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ACTIO=\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\gui\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_ACTIO=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ACTIO=\
+	"..\..\..\backends\epoc\SymbianActions.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_ACTIO=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_ACTIO=\
+	"..\..\..\backends\epoc\SymbianActions.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\Actions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\browser.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_BROWS=\
+	"..\..\..\gui\backends\fs\fs.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\browser.h"\
+	"..\..\..\gui\gui\ListWidget.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_BROWS=\
+	"..\..\..\gui\backends\fs\fs.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\browser.h"\
+	"..\..\..\gui\gui\ListWidget.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_BROWS=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_BROWS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_BROWS=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_BROWS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_BROWS=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_BROWS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_BROWS=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_BROWS=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_BROWS=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_BROWS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_BROWS=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_BROWS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_BROWS=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_BROWS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_BROWS=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_BROWS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\browser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\chooser.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_CHOOS=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\chooser.h"\
+	"..\..\..\gui\gui\ListWidget.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_CHOOS=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\chooser.h"\
+	"..\..\..\gui\gui\ListWidget.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_CHOOS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CHOOS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_CHOOS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CHOOS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CHOOS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CHOOS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CHOOS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CHOOS=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CHOOS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CHOOS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CHOOS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CHOOS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CHOOS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CHOOS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CHOOS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CHOOS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\chooser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\console.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_CONSO=\
+	"..\..\..\gui\base\engine.h"\
+	"..\..\..\gui\base\version.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\graphics\font.h"\
+	"..\..\..\gui\gui\console.h"\
+	"..\..\..\gui\gui\ScrollBarWidget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_CONSO=\
+	"..\..\..\gui\base\engine.h"\
+	"..\..\..\gui\base\version.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\graphics\font.h"\
+	"..\..\..\gui\gui\console.h"\
+	"..\..\..\gui\gui\ScrollBarWidget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_CONSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_CONSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CONSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CONSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CONSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CONSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CONSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CONSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\console.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\credits.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\dialog.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_DIALO=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\PopUpWidget.h"\
+	"..\..\..\gui\gui\widget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_DIALO=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\PopUpWidget.h"\
+	"..\..\..\gui\gui\widget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_DIALO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\editable.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_EDITA=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\gui\editable.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_EDITA=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\gui\editable.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_EDITA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_EDITA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_EDITA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_EDITA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITA=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_EDITA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_EDITA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_EDITA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_EDITA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\editable.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\EditTextWidget.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_EDITT=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\EditTextWidget.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_EDITT=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\EditTextWidget.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_EDITT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_EDITT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_EDITT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_EDITT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITT=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_EDITT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_EDITT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_EDITT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_EDITT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EDITT=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\EditTextWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\eval.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_EVAL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EVAL_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_EVAL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EVAL_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_EVAL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EVAL_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_EVAL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EVAL_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_EVAL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EVAL_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_EVAL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_EVAL_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\eval.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\Key.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_KEY_C=\
+	"..\..\..\gui\gui\Key.h"\
+	"..\..\..\gui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_KEY_C=\
+	"..\..\..\gui\gui\Key.h"\
+	"..\..\..\gui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_KEY_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_KEY_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_KEY_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_KEY_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_KEY_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_KEY_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_KEY_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_KEY_C=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_KEY_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_KEY_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_KEY_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_KEY_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_KEY_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_KEY_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_KEY_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_KEY_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\Key.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\KeysDialog.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_KEYSD=\
+	"..\..\..\gui\CEDevice.h"\
+	"..\..\..\gui\gui\Actions.h"\
+	"..\..\..\gui\gui\KeysDialog.h"\
+	"..\..\..\gui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_KEYSD=\
+	"..\..\..\gui\CEDevice.h"\
+	"..\..\..\gui\gui\Actions.h"\
+	"..\..\..\gui\gui\KeysDialog.h"\
+	"..\..\..\gui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_KEYSD=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_KEYSD=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_KEYSD=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_KEYSD=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_types.h"\
+	".\DL_byteorder.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_KEYSD=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_KEYSD=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_KEYSD=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"gx.h"\
+	
+NODEP_CPP_KEYSD=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_KEYSD=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_KEYSD=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_KEYSD=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_KEYSD=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_KEYSD=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_KEYSD=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_KEYSD=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_KEYSD=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\KeysDialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\launcher.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_LAUNC=\
+	"..\..\..\gui\backends\fs\fs.h"\
+	"..\..\..\gui\base\engine.h"\
+	"..\..\..\gui\base\options.h"\
+	"..\..\..\gui\base\plugins.h"\
+	"..\..\..\gui\base\version.h"\
+	"..\..\..\gui\common\config-manager.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\common\util.h"\
+	"..\..\..\gui\gui\about.h"\
+	"..\..\..\gui\gui\browser.h"\
+	"..\..\..\gui\gui\chooser.h"\
+	"..\..\..\gui\gui\EditTextWidget.h"\
+	"..\..\..\gui\gui\launcher.h"\
+	"..\..\..\gui\gui\ListWidget.h"\
+	"..\..\..\gui\gui\message.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\options.h"\
+	"..\..\..\gui\gui\PopUpWidget.h"\
+	"..\..\..\gui\gui\TabWidget.h"\
+	"..\..\..\gui\sound\mididrv.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_LAUNC=\
+	"..\..\..\gui\backends\fs\fs.h"\
+	"..\..\..\gui\base\engine.h"\
+	"..\..\..\gui\base\options.h"\
+	"..\..\..\gui\base\plugins.h"\
+	"..\..\..\gui\base\version.h"\
+	"..\..\..\gui\common\config-manager.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\common\util.h"\
+	"..\..\..\gui\gui\about.h"\
+	"..\..\..\gui\gui\browser.h"\
+	"..\..\..\gui\gui\chooser.h"\
+	"..\..\..\gui\gui\EditTextWidget.h"\
+	"..\..\..\gui\gui\launcher.h"\
+	"..\..\..\gui\gui\ListWidget.h"\
+	"..\..\..\gui\gui\message.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\options.h"\
+	"..\..\..\gui\gui\PopUpWidget.h"\
+	"..\..\..\gui\gui\TabWidget.h"\
+	"..\..\..\gui\sound\mididrv.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_LAUNC=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_LAUNC=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_LAUNC=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_LAUNC=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_LAUNC=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_LAUNC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_LAUNC=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_LAUNC=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_LAUNC=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_LAUNC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_LAUNC=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_LAUNC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_LAUNC=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_LAUNC=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_LAUNC=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\EditTextWidget.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_LAUNC=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\launcher.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\ListWidget.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_LISTW=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\ListWidget.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\ScrollBarWidget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_LISTW=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\ListWidget.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\ScrollBarWidget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_LISTW=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_LISTW=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_LISTW=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_LISTW=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_LISTW=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_LISTW=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_LISTW=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_LISTW=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_LISTW=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_LISTW=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_LISTW=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_LISTW=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_LISTW=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_LISTW=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_LISTW=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_LISTW=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\ListWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\message.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_MESSA=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\str.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\message.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\widget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_MESSA=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\str.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\message.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\widget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_MESSA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_MESSA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_MESSA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_MESSA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MESSA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_MESSA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_MESSA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_MESSA=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_MESSA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_MESSA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_MESSA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_MESSA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_MESSA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_MESSA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_MESSA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_MESSA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\message.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\newgui.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_NEWGU=\
+	"..\..\..\gui\arm\macros.h"\
+	"..\..\..\gui\arm\native.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\common\util.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_NEWGU=\
+	"..\..\..\gui\arm\macros.h"\
+	"..\..\..\gui\arm\native.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\common\util.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_NEWGU=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_NEWGU=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\gui\arm\macros.h"\
+	"..\..\..\gui\arm\native.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_NEWGU=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_NEWGU=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\gui\arm\macros.h"\
+	"..\..\..\gui\arm\native.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_NEWGU=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_NEWGU=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_NEWGU=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_NEWGU=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_NEWGU=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_NEWGU=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_NEWGU=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_NEWGU=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_NEWGU=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_NEWGU=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\gui\arm\macros.h"\
+	"..\..\..\gui\arm\native.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_NEWGU=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_NEWGU=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\gui\arm\macros.h"\
+	"..\..\..\gui\arm\native.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\newgui.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\options.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_OPTIO=\
+	"..\..\..\gui\backends\fs\fs.h"\
+	"..\..\..\gui\common\config-manager.h"\
+	"..\..\..\gui\common\scaler.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\browser.h"\
+	"..\..\..\gui\gui\chooser.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\options.h"\
+	"..\..\..\gui\gui\PopUpWidget.h"\
+	"..\..\..\gui\gui\TabWidget.h"\
+	"..\..\..\gui\sound\mididrv.h"\
+	"..\..\..\gui\sound\mixer.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_OPTIO=\
+	"..\..\..\gui\backends\fs\fs.h"\
+	"..\..\..\gui\common\config-manager.h"\
+	"..\..\..\gui\common\scaler.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\browser.h"\
+	"..\..\..\gui\gui\chooser.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\options.h"\
+	"..\..\..\gui\gui\PopUpWidget.h"\
+	"..\..\..\gui\gui\TabWidget.h"\
+	"..\..\..\gui\sound\mididrv.h"\
+	"..\..\..\gui\sound\mixer.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_OPTIO=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_OPTIO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_OPTIO=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_OPTIO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_OPTIO=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_OPTIO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_OPTIO=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_OPTIO=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_OPTIO=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_OPTIO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_OPTIO=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_OPTIO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_OPTIO=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_OPTIO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_OPTIO=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\chooser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\options.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_OPTIO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\options.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\PopUpWidget.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_POPUP=\
+	"..\..\..\gui\base\engine.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\PopUpWidget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_POPUP=\
+	"..\..\..\gui\base\engine.h"\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\system.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\PopUpWidget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_POPUP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_POPUP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_POPUP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_POPUP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_POPUP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_POPUP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_POPUP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_POPUP=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_POPUP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_POPUP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_POPUP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_POPUP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_POPUP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_POPUP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_POPUP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\PopUpWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_POPUP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\PopUpWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\ScrollBarWidget.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+DEP_CPP_SCROL=\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\widget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+DEP_CPP_SCROL=\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\widget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\ScrollBarWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\TabWidget.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_TABWI=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\util.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\TabWidget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_TABWI=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\util.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\TabWidget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_TABWI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_TABWI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_TABWI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_TABWI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_TABWI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_TABWI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_TABWI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_TABWI=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_TABWI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_TABWI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_TABWI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_TABWI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_TABWI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_TABWI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_TABWI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\TabWidget.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_TABWI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\TabWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\gui\theme-config.cpp"
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_THEME=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_THEME=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_THEME=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_THEME=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_THEME=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_THEME=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\theme.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_THEME_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_THEME_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_THEME_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_THEME_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_THEME_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_THEME_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEME_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\theme.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\ThemeClassic.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_THEMEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEC=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_THEMEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEC=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_THEMEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEC=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_THEMEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEC=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_THEMEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEC=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_THEMEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEC=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\ThemeNew.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_THEMEN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\unzip.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\imagedec.h"\
+	"..\..\..\graphics\imageman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEN=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_THEMEN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\unzip.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\imagedec.h"\
+	"..\..\..\graphics\imageman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEN=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_THEMEN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\unzip.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\imagedec.h"\
+	"..\..\..\graphics\imageman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEN=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_THEMEN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\unzip.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\imagedec.h"\
+	"..\..\..\graphics\imageman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEN=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_THEMEN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\unzip.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\imagedec.h"\
+	"..\..\..\graphics\imageman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEN=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_THEMEN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\unzip.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\imagedec.h"\
+	"..\..\..\graphics\imageman.h"\
+	"..\..\..\graphics\paletteman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_THEMEN=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\widget.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_WIDGE=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\util.h"\
+	"..\..\..\gui\graphics\fontman.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\widget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_WIDGE=\
+	"..\..\..\gui\common\stdafx.h"\
+	"..\..\..\gui\common\util.h"\
+	"..\..\..\gui\graphics\fontman.h"\
+	"..\..\..\gui\gui\dialog.h"\
+	"..\..\..\gui\gui\newgui.h"\
+	"..\..\..\gui\gui\widget.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_WIDGE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_WIDGE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_WIDGE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_WIDGE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_WIDGE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_WIDGE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_WIDGE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_WIDGE=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_WIDGE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_WIDGE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_WIDGE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\eval.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_WIDGE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_WIDGE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_WIDGE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_WIDGE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_WIDGE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\gui\widget.h
+# End Source File
+# End Group
+# Begin Group "backends"
+
+# PROP Default_Filter ""
+# Begin Group "wince"
+
+# PROP Default_Filter ""
+# Begin Group "missing"
+
+# PROP Default_Filter ""
+# Begin Group "sys"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\sys\stat.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\sys\time.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\sys\types.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\assert.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\conio.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\dir.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\direct.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\dirent.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\errno.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\fcntl.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\io.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\missing.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+DEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\dirent.h"\
+	"..\..\..\backends\wince\missing\sys\time.h"\
+	
+NODEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\portdefs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+DEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\dirent.h"\
+	"..\..\..\backends\wince\missing\sys\time.h"\
+	
+NODEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\portdefs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\dirent.h"\
+	"..\..\..\backends\wince\missing\sys\time.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\dirent.h"\
+	"..\..\..\backends\wince\missing\sys\time.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\dirent.h"\
+	"..\..\..\backends\wince\missing\sys\time.h"\
+	
+NODEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\portdefs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\dirent.h"\
+	"..\..\..\backends\wince\missing\sys\time.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\dirent.h"\
+	"..\..\..\backends\wince\missing\sys\time.h"\
+	
+NODEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\portdefs.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\dirent.h"\
+	"..\..\..\backends\wince\missing\sys\time.h"\
+	
+NODEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\portdefs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\dirent.h"\
+	"..\..\..\backends\wince\missing\sys\time.h"\
 	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"\
+NODEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\portdefs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\dirent.h"\
+	"..\..\..\backends\wince\missing\sys\time.h"\
 	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"\
+NODEP_CPP_MISSI=\
+	"..\..\..\backends\wince\missing\portdefs.h"\
 	
 
 !ENDIF 
@@ -11091,7 +17665,11 @@ NODEP_CPP_PANEL=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\Panel.h
+SOURCE=..\..\..\backends\wince\portdefs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\signal.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -11122,16 +17700,85 @@ SOURCE=..\..\..\backends\wince\CEgui\Panel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\PanelItem.cpp
+SOURCE=..\..\..\backends\wince\missing\time.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_PANELI=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\missing\unistd.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "CEgui"
+
+# PROP Default_Filter ""
+# Begin Group "generic"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEgui\GUIElement.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELI=\
+NODEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
@@ -11141,13 +17788,12 @@ NODEP_CPP_PANELI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_PANELI=\
+DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELI=\
+NODEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -11159,15 +17805,13 @@ NODEP_CPP_PANELI=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_PANELI=\
+DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -11177,9 +17821,10 @@ DEP_CPP_PANELI=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_PANELI=\
+NODEP_CPP_GUIEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -11208,17 +17853,15 @@ NODEP_CPP_PANELI=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_PANELI=\
+DEP_CPP_GUIEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -11227,100 +17870,51 @@ DEP_CPP_PANELI=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PANELI=\
+NODEP_CPP_GUIEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.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"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_PANELI=\
+DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\map.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"\
 	
-NODEP_CPP_PANELI=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
+NODEP_CPP_GUIEL=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -11345,15 +17939,61 @@ NODEP_CPP_PANELI=\
 	".\lose_code.h"\
 	
 
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_GUIEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_GUIEL=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PANELI=\
+DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELI=\
+NODEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -11386,13 +18026,12 @@ NODEP_CPP_PANELI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PANELI=\
+DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELI=\
+NODEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -11425,13 +18064,12 @@ NODEP_CPP_PANELI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PANELI=\
+DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELI=\
+NODEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -11464,13 +18102,12 @@ NODEP_CPP_PANELI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PANELI=\
+DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELI=\
+NODEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -11506,7 +18143,7 @@ NODEP_CPP_PANELI=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\PanelItem.h
+SOURCE=..\..\..\backends\wince\CEgui\GUIElement.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -11537,14 +18174,19 @@ SOURCE=..\..\..\backends\wince\CEgui\PanelItem.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\SDL_ImageResource.cpp
+SOURCE=..\..\..\backends\wince\CEgui\Panel.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SDL_I=\
+DEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_SDL_I=\
+NODEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\str.h"\
@@ -11555,12 +18197,18 @@ NODEP_CPP_SDL_I=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SDL_I=\
+DEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_SDL_I=\
+NODEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\SDL.h"\
 	
@@ -11568,21 +18216,28 @@ NODEP_CPP_SDL_I=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_SDL_I=\
+DEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.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"\
 	
-NODEP_CPP_SDL_I=\
+NODEP_CPP_PANEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -11611,57 +18266,70 @@ NODEP_CPP_SDL_I=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_SDL_I=\
+DEP_CPP_PANEL=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SDL_I=\
+NODEP_CPP_PANEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SDL_I=\
+DEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_SDL_I=\
+NODEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
@@ -11690,55 +18358,71 @@ NODEP_CPP_SDL_I=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SDL_I=\
+DEP_CPP_PANEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_SDL_I=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_PANEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SDL_I=\
+DEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_SDL_I=\
+NODEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
@@ -11767,12 +18451,18 @@ NODEP_CPP_SDL_I=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SDL_I=\
+DEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_SDL_I=\
+NODEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
@@ -11801,12 +18491,18 @@ NODEP_CPP_SDL_I=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SDL_I=\
+DEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_SDL_I=\
+NODEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
@@ -11835,12 +18531,18 @@ NODEP_CPP_SDL_I=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SDL_I=\
+DEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_SDL_I=\
+NODEP_CPP_PANEL=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
@@ -11872,7 +18574,7 @@ NODEP_CPP_SDL_I=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\SDL_ImageResource.h
+SOURCE=..\..\..\backends\wince\CEgui\Panel.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -11903,15 +18605,16 @@ SOURCE=..\..\..\backends\wince\CEgui\SDL_ImageResource.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\Toolbar.cpp
+SOURCE=..\..\..\backends\wince\CEgui\PanelItem.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_TOOLB=\
+DEP_CPP_PANELI=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_TOOLB=\
+NODEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
@@ -11921,12 +18624,13 @@ NODEP_CPP_TOOLB=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_TOOLB=\
+DEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_TOOLB=\
+NODEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -11938,14 +18642,14 @@ NODEP_CPP_TOOLB=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_TOOLB=\
+DEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -11955,9 +18659,10 @@ DEP_CPP_TOOLB=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_TOOLB=\
+NODEP_CPP_PANELI=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -11986,16 +18691,16 @@ NODEP_CPP_TOOLB=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_TOOLB=\
+DEP_CPP_PANELI=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -12004,44 +18709,46 @@ DEP_CPP_TOOLB=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_TOOLB=\
+NODEP_CPP_PANELI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_TOOLB=\
+DEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_TOOLB=\
+NODEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -12074,60 +18781,61 @@ NODEP_CPP_TOOLB=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_TOOLB=\
+DEP_CPP_PANELI=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.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"\
 	
-NODEP_CPP_TOOLB=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_PANELI=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_TOOLB=\
+DEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_TOOLB=\
+NODEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -12160,12 +18868,13 @@ NODEP_CPP_TOOLB=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_TOOLB=\
+DEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_TOOLB=\
+NODEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -12198,12 +18907,13 @@ NODEP_CPP_TOOLB=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_TOOLB=\
+DEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_TOOLB=\
+NODEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -12236,12 +18946,13 @@ NODEP_CPP_TOOLB=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_TOOLB=\
+DEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_TOOLB=\
+NODEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -12277,7 +18988,7 @@ NODEP_CPP_TOOLB=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\Toolbar.h
+SOURCE=..\..\..\backends\wince\CEgui\PanelItem.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -12308,36 +19019,30 @@ SOURCE=..\..\..\backends\wince\CEgui\Toolbar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\ToolbarHandler.cpp
+SOURCE=..\..\..\backends\wince\CEgui\SDL_ImageResource.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+DEP_CPP_SDL_I=\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
+NODEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\string.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+DEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
+NODEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\SDL.h"\
 	
@@ -12345,25 +19050,19 @@ NODEP_CPP_TOOLBA=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+DEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\map.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"\
 	
-NODEP_CPP_TOOLBA=\
+NODEP_CPP_SDL_I=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\config.h"\
@@ -12394,68 +19093,57 @@ NODEP_CPP_TOOLBA=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_TOOLBA=\
+DEP_CPP_SDL_I=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_TOOLBA=\
+NODEP_CPP_SDL_I=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+DEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
+NODEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
@@ -12484,66 +19172,57 @@ NODEP_CPP_TOOLBA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+DEP_CPP_SDL_I=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.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"\
 	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_SDL_I=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+DEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
+NODEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
@@ -12572,17 +19251,12 @@ NODEP_CPP_TOOLBA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+DEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
+NODEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
@@ -12611,17 +19285,12 @@ NODEP_CPP_TOOLBA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+DEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
+NODEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
@@ -12650,17 +19319,12 @@ NODEP_CPP_TOOLBA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+DEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
+NODEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
@@ -12692,7 +19356,7 @@ NODEP_CPP_TOOLBA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\ToolbarHandler.h
+SOURCE=..\..\..\backends\wince\CEgui\SDL_ImageResource.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -12721,71 +19385,52 @@ SOURCE=..\..\..\backends\wince\CEgui\ToolbarHandler.h
 !ENDIF 
 
 # End Source File
-# End Group
-# Begin Group "specific"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\ItemAction.cpp
+SOURCE=..\..\..\backends\wince\CEgui\Toolbar.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+DEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
+NODEP_CPP_TOOLB=\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+DEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEgui\PanelItem.h"\
+NODEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\gui\Actions.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+DEP_CPP_TOOLB=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
@@ -12793,11 +19438,10 @@ DEP_CPP_ITEMA=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+NODEP_CPP_TOOLB=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -12821,25 +19465,20 @@ NODEP_CPP_ITEMA=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
-	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_ITEMA=\
+DEP_CPP_TOOLB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -12848,95 +19487,136 @@ DEP_CPP_ITEMA=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\Key.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_ITEMA=\
+NODEP_CPP_TOOLB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+DEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
+NODEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.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"
-
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_TOOLB=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_TOOLB=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	
+NODEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -12959,59 +19639,120 @@ NODEP_CPP_ITEMA=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+DEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
+NODEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.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"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+DEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
+NODEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.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"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+DEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
+NODEP_CPP_TOOLB=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.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"\
 	
 
 !ENDIF 
@@ -13019,7 +19760,7 @@ NODEP_CPP_ITEMA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\ItemAction.h
+SOURCE=..\..\..\backends\wince\CEgui\Toolbar.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -13050,64 +19791,51 @@ SOURCE=..\..\..\backends\wince\CEgui\ItemAction.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\ItemSwitch.cpp
+SOURCE=..\..\..\backends\wince\CEgui\ToolbarHandler.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+DEP_CPP_TOOLBA=\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_ITEMS=\
+NODEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\string.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_ITEMS=\
+DEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_ITEMS=\
+NODEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\EventsBuffer.h"\
 	"..\..\..\backends\wince\CEgui\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_ITEMS=\
+DEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -13117,10 +19845,10 @@ DEP_CPP_ITEMS=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+NODEP_CPP_TOOLBA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -13149,21 +19877,16 @@ NODEP_CPP_ITEMS=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_ITEMS=\
+DEP_CPP_TOOLBA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -13172,54 +19895,51 @@ DEP_CPP_ITEMS=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\Key.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_ITEMS=\
+NODEP_CPP_TOOLBA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_ITEMS=\
+DEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_ITEMS=\
+NODEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -13247,34 +19967,71 @@ NODEP_CPP_ITEMS=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ITEMS=\
+DEP_CPP_TOOLBA=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_TOOLBA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_TOOLBA=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	
+NODEP_CPP_TOOLBA=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -13299,23 +20056,20 @@ NODEP_CPP_ITEMS=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ITEMS=\
+DEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_ITEMS=\
+NODEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -13341,23 +20095,20 @@ NODEP_CPP_ITEMS=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ITEMS=\
+DEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_ITEMS=\
+NODEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -13383,23 +20134,20 @@ NODEP_CPP_ITEMS=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ITEMS=\
+DEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	
-NODEP_CPP_ITEMS=\
+NODEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
 	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -13425,24 +20173,118 @@ NODEP_CPP_ITEMS=\
 	".\lose_code.h"\
 	
 
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEgui\ToolbarHandler.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ITEMS=\
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "specific"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEgui\ItemAction.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+DEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+	
+NODEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\CEActions.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+DEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+	
+NODEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\gui\Actions.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_ITEMA=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
 	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
 	"..\..\..\backends\wince\CEgui\Panel.h"\
 	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\common\array.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"\
 	
-NODEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
+NODEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -13465,6 +20307,179 @@ NODEP_CPP_ITEMS=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_ITEMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_ITEMA=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+	
+NODEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\CEActions.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_ITEMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_ITEMA=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+	
+NODEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\CEActions.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+	
+NODEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\CEActions.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+	
+NODEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\CEActions.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+	
+NODEP_CPP_ITEMA=\
+	"..\..\..\backends\wince\CEgui\CEActions.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	
 
 !ENDIF 
@@ -13472,7 +20487,7 @@ NODEP_CPP_ITEMS=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\ItemSwitch.h
+SOURCE=..\..\..\backends\wince\CEgui\ItemAction.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -13503,34 +20518,39 @@ SOURCE=..\..\..\backends\wince\CEgui\ItemSwitch.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEgui\PanelKeyboard.cpp
+SOURCE=..\..\..\backends\wince\CEgui\ItemSwitch.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_PANELK=\
+DEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELK=\
+NODEP_CPP_ITEMS=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
 	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysQueue.h"\
+	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
 	"..\..\..\backends\wince\CEgui\SDL.h"\
 	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_PANELK=\
+DEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELK=\
+NODEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -13543,9 +20563,11 @@ NODEP_CPP_PANELK=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_PANELK=\
+DEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
@@ -13553,7 +20575,6 @@ DEP_CPP_PANELK=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -13563,10 +20584,11 @@ DEP_CPP_PANELK=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_PANELK=\
+NODEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -13595,10 +20617,12 @@ NODEP_CPP_PANELK=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_PANELK=\
+DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
@@ -13607,7 +20631,6 @@ DEP_CPP_PANELK=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -13617,45 +20640,48 @@ DEP_CPP_PANELK=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\gui\Key.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PANELK=\
+NODEP_CPP_ITEMS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_PANELK=\
+DEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELK=\
+NODEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -13689,65 +20715,72 @@ NODEP_CPP_PANELK=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_PANELK=\
+DEP_CPP_ITEMS=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
 	
-NODEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_ITEMS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PANELK=\
+DEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELK=\
+NODEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -13781,13 +20814,15 @@ NODEP_CPP_PANELK=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PANELK=\
+DEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELK=\
+NODEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -13821,53 +20856,15 @@ NODEP_CPP_PANELK=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.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"
-
-DEP_CPP_PANELK=\
+DEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_PANELK=\
+NODEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\common\map.h"\
 	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
 	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
@@ -13881,97 +20878,72 @@ NODEP_CPP_PANELK=\
 	".\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"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\CEgui\PanelKeyboard.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\CEgui\CEGUI.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+	".\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"
 
+DEP_CPP_ITEMS=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	
+NODEP_CPP_ITEMS=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.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"\
+	
+
 !ENDIF 
 
 # End Source File
-# End Group
-# Begin Group "CEkeys"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEkeys\CEKeys.h
+SOURCE=..\..\..\backends\wince\CEgui\ItemSwitch.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -14002,55 +20974,70 @@ SOURCE=..\..\..\backends\wince\CEkeys\CEKeys.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEkeys\EventsBuffer.cpp
+SOURCE=..\..\..\backends\wince\CEgui\PanelKeyboard.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+DEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\common\list.h"\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
+NODEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\KeysQueue.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+DEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\common\list.h"\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\gui\Key.h"\
+NODEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_EVENT=\
+DEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.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"\
 	
-NODEP_CPP_EVENT=\
+NODEP_CPP_PANELK=\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -14079,11 +21066,16 @@ NODEP_CPP_EVENT=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_EVENT=\
+DEP_CPP_PANELK=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
@@ -14091,57 +21083,57 @@ DEP_CPP_EVENT=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\gui\Key.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_EVENT=\
+NODEP_CPP_PANELK=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
+DEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+NODEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -14168,25 +21160,71 @@ NODEP_CPP_EVENT=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_EVENT=\
+DEP_CPP_PANELK=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_PANELK=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	
+NODEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -14211,24 +21249,62 @@ NODEP_CPP_EVENT=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
+DEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+NODEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.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"
+
+DEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	
+NODEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -14253,24 +21329,22 @@ NODEP_CPP_EVENT=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
+DEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+NODEP_CPP_PANELK=\
+	"..\..\..\backends\wince\CEgui\common\map.h"\
+	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
+	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
+	"..\..\..\backends\wince\CEgui\common\str.h"\
+	"..\..\..\backends\wince\CEgui\common\system.h"\
+	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
+	"..\..\..\backends\wince\CEgui\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -14295,52 +21369,79 @@ NODEP_CPP_EVENT=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+!ENDIF 
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	
-NODEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEgui\PanelKeyboard.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	
-NODEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEgui\CEGUI.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 !ENDIF 
 
 # End Source File
+# End Group
+# Begin Group "CEkeys"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEkeys\EventsBuffer.h
+SOURCE=..\..\..\backends\wince\CEkeys\CEKeys.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -14371,38 +21472,43 @@ SOURCE=..\..\..\backends\wince\CEkeys\EventsBuffer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEkeys\Key.cpp
+SOURCE=..\..\..\backends\wince\CEkeys\EventsBuffer.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	
-NODEP_CPP_KEY_C=\
+NODEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\common\list.h"\
 	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
 	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
 	"..\..\..\backends\wince\CEkeys\common\system.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\backends\wince\CEkeys\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	
-NODEP_CPP_KEY_C=\
+NODEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\common\list.h"\
 	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
 	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
 	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
+	"..\..\..\backends\wince\CEkeys\gui\Key.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_KEY_C=\
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -14411,23 +21517,45 @@ DEP_CPP_KEY_C=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_KEY_C=\
+NODEP_CPP_EVENT=\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\config.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 ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_KEY_C=\
+DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -14435,111 +21563,248 @@ DEP_CPP_KEY_C=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\gui\Key.h"\
 	
-NODEP_CPP_KEY_C=\
+NODEP_CPP_EVENT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-NODEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_EVENT=\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\config.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"
+
+DEP_CPP_EVENT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\Key.h"\
+	
+NODEP_CPP_EVENT=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_KEY_C=\
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_KEY_C=\
+NODEP_CPP_EVENT=\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
 	"..\..\..\config.h"\
+	".\DL.h"\
+	".\DL_active.h"\
+	".\DL_audio.h"\
 	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-NODEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.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) Release"
 
-NODEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_EVENT=\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\config.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"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_KEY_C=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\config.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_KEY_C=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\config.h"\
 	
 
 !ENDIF 
@@ -14547,7 +21812,7 @@ NODEP_CPP_KEY_C=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEkeys\Key.h
+SOURCE=..\..\..\backends\wince\CEkeys\EventsBuffer.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -14579,11 +21844,12 @@ SOURCE=..\..\..\backends\wince\CEkeys\Key.h
 # End Group
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEActions.cpp
+SOURCE=..\..\..\backends\wince\CEActionsPocket.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
 DEP_CPP_CEACT=\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
@@ -14595,26 +21861,28 @@ NODEP_CPP_CEACT=\
 	"..\..\..\backends\wince\CEActions.h"\
 	"..\..\..\backends\wince\CEgui.h"\
 	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
 	"..\..\..\backends\wince\common\scaler.h"\
 	"..\..\..\backends\wince\common\scaler\intern.h"\
 	"..\..\..\backends\wince\common\scummsys.h"\
 	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\gui\message.h"\
 	"..\..\..\backends\wince\Key.h"\
 	"..\..\..\backends\wince\KeysBuffer.h"\
+	"..\..\..\backends\wince\scumm\scumm.h"\
 	"..\..\..\backends\wince\stdafx.h"\
+	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
 DEP_CPP_CEACT=\
-	"..\..\..\backends\wince\CEActions.h"\
 	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	{$(INCLUDE)}"gx.h"\
 	
 NODEP_CPP_CEACT=\
 	"..\..\..\backends\wince\backends\intern.h"\
@@ -14629,22 +21897,186 @@ NODEP_CPP_CEACT=\
 	"..\..\..\backends\wince\common\stdafx.h"\
 	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\EventsBuffer.h"\
 	"..\..\..\backends\wince\gui\Actions.h"\
 	"..\..\..\backends\wince\gui\Key.h"\
 	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
 	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_CEACT=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	
+NODEP_CPP_CEACT=\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\wiz_he.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"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_CEACT=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CEACT=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
+	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-# PROP Intermediate_Dir "ARMV4Rel\backend"
 DEP_CPP_CEACT=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -14662,38 +22094,33 @@ DEP_CPP_CEACT=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.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\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
 NODEP_CPP_CEACT=\
 	"..\..\..\backends\wince\CEActions.h"\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\config.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -14719,16 +22146,13 @@ NODEP_CPP_CEACT=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
 DEP_CPP_CEACT=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
 	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -14741,98 +22165,209 @@ DEP_CPP_CEACT=\
 	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\colormasks.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\Actions.h"\
 	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
 	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
 	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\mididrv.h"\
 	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CEACT=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_CEACT=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.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\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
 	
 NODEP_CPP_CEACT=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
 	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.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"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CEACT=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.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\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	
+NODEP_CPP_CEACT=\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -14858,13 +22393,66 @@ NODEP_CPP_CEACT=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CEACT=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.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\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	
+NODEP_CPP_CEACT=\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 DEP_CPP_CEACT=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -14876,128 +22464,90 @@ DEP_CPP_CEACT=\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.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\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
 NODEP_CPP_CEACT=\
 	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
+	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\config.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"\
-	".\x.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ENDIF 
 
-DEP_CPP_CEACT=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACT=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.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"\
-	".\x.h"\
-	
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEActionsPocket.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CEACT=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEActionsSmartphone.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+DEP_CPP_CEACTI=\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	
-NODEP_CPP_CEACT=\
+NODEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\backends\intern.h"\
 	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\base\options.h"\
@@ -15016,43 +22566,21 @@ NODEP_CPP_CEACT=\
 	"..\..\..\backends\wince\KeysBuffer.h"\
 	"..\..\..\backends\wince\scumm\scumm.h"\
 	"..\..\..\backends\wince\stdafx.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"\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CEACT=\
+DEP_CPP_CEACTI=\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	
-NODEP_CPP_CEACT=\
+NODEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\backends\intern.h"\
 	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\CEActions.h"\
 	"..\..\..\backends\wince\CEgui.h"\
 	"..\..\..\backends\wince\CEkeys.h"\
 	"..\..\..\backends\wince\common\config-manager.h"\
@@ -15062,62 +22590,71 @@ NODEP_CPP_CEACT=\
 	"..\..\..\backends\wince\common\stdafx.h"\
 	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\EventsBuffer.h"\
+	"..\..\..\backends\wince\gui\Actions.h"\
+	"..\..\..\backends\wince\gui\Key.h"\
 	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
 	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.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"\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_CEACT=\
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_CEACTI=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
 	
-NODEP_CPP_CEACT=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
+NODEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\wiz_he.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -15143,106 +22680,266 @@ NODEP_CPP_CEACT=\
 	".\x.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\CEActions.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_CEACTI=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CEACTI=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
+	".\x.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\CEActionsPocket.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
 DEP_CPP_CEACTI=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\CEActionsPocket.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.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\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
 	
 NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
 	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.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"\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
 	{$(INCLUDE)}"gx.h"\
 	
 NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\EventsBuffer.h"\
-	"..\..\..\backends\wince\gui\Actions.h"\
-	"..\..\..\backends\wince\gui\Key.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-# PROP Intermediate_Dir "ARMV4Rel\backend"
 DEP_CPP_CEACTI=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
@@ -15264,38 +22961,34 @@ DEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.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\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\wiz_he.h"\
 	
 NODEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\CEActions.h"\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\backends\wince\KeysBuffer.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\config.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -15321,12 +23014,10 @@ NODEP_CPP_CEACTI=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
 DEP_CPP_CEACTI=\
 	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\CEActionsPocket.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
@@ -15346,67 +23037,60 @@ DEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
 	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\Key.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CEACTI=\
-	"..\..\..\common\config.h"\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\backends\wince\KeysBuffer.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.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"\
+	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_CEACTI=\
 	"..\..\..\backends\intern.h"\
@@ -15423,21 +23107,16 @@ DEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -15447,41 +23126,25 @@ DEP_CPP_CEACTI=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
 NODEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\config.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"\
-	".\x.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 DEP_CPP_CEACTI=\
 	"..\..\..\backends\intern.h"\
@@ -15498,43 +23161,154 @@ DEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\CEgui\Toolbar.h"\
 	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.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\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
+	
+NODEP_CPP_CEACTI=\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
+	"..\..\..\backends\wince\CEgui\SDL.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\script.h"\
 	"..\..\..\scumm\scumm.h"\
 	
-NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\CEActions.h"\
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEActionsSmartphone.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEDevice.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+DEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	
+NODEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+DEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	
+NODEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_CEDEV=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\common\array.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"\
+	
+NODEP_CPP_CEDEV=\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -15561,12 +23335,13 @@ NODEP_CPP_CEACTI=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_CEACTI=\
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_CEDEV=\
 	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -15583,65 +23358,73 @@ DEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Key.h"\
 	
-NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+NODEP_CPP_CEDEV=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
 	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.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"\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CEACTI=\
+DEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	
+NODEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\stdafx.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CEDEV=\
 	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -15655,168 +23438,212 @@ DEP_CPP_CEACTI=\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Key.h"\
+	{$(INCLUDE)}"gx.h"\
 	
-NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+NODEP_CPP_CEDEV=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	
+NODEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\stdafx.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	
+NODEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\stdafx.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	
+NODEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\stdafx.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	
+NODEP_CPP_CEDEV=\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\stdafx.h"\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEDevice.h
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\wince\CEException.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+DEP_CPP_CEEXC=\
+	"..\..\..\backends\wince\CEException.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+DEP_CPP_CEEXC=\
+	"..\..\..\backends\wince\CEException.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_CEEXC=\
+	"..\..\..\backends\wince\CEException.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_CEEXC=\
+	"..\..\..\backends\wince\CEException.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CEEXC=\
+	"..\..\..\backends\wince\CEException.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_CEEXC=\
+	"..\..\..\backends\wince\CEException.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CEACTI=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+DEP_CPP_CEEXC=\
+	"..\..\..\backends\wince\CEException.h"\
 	
-NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CEEXC=\
+	"..\..\..\backends\wince\CEException.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CEACTI=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+DEP_CPP_CEEXC=\
+	"..\..\..\backends\wince\CEException.h"\
 	
-NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CEEXC=\
+	"..\..\..\backends\wince\CEException.h"\
 	
 
 !ENDIF 
@@ -15824,7 +23651,7 @@ NODEP_CPP_CEACTI=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEActionsPocket.h
+SOURCE=..\..\..\backends\wince\CEException.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -15855,74 +23682,71 @@ SOURCE=..\..\..\backends\wince\CEActionsPocket.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEActionsSmartphone.cpp
+SOURCE=..\..\..\backends\wince\CEKeysDialog.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
+DEP_CPP_CEKEY=\
 	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	
-NODEP_CPP_CEACTIO=\
+NODEP_CPP_CEKEY=\
 	"..\..\..\backends\wince\backends\intern.h"\
 	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\base\options.h"\
 	"..\..\..\backends\wince\CEActions.h"\
 	"..\..\..\backends\wince\CEgui.h"\
 	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
 	"..\..\..\backends\wince\common\scaler.h"\
 	"..\..\..\backends\wince\common\scaler\intern.h"\
 	"..\..\..\backends\wince\common\scummsys.h"\
 	"..\..\..\backends\wince\common\stdafx.h"\
 	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
 	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
 	"..\..\..\backends\wince\stdafx.h"\
 	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+DEP_CPP_CEKEY=\
 	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	{$(INCLUDE)}"gx.h"\
 	
-NODEP_CPP_CEACTIO=\
+NODEP_CPP_CEKEY=\
 	"..\..\..\backends\wince\backends\intern.h"\
 	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\CEActions.h"\
 	"..\..\..\backends\wince\CEgui.h"\
 	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
 	"..\..\..\backends\wince\common\scaler.h"\
 	"..\..\..\backends\wince\common\scaler\intern.h"\
 	"..\..\..\backends\wince\common\scummsys.h"\
 	"..\..\..\backends\wince\common\stdafx.h"\
 	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\EventsBuffer.h"\
-	"..\..\..\backends\wince\gui\Actions.h"\
-	"..\..\..\backends\wince\gui\Key.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\Key.h"\
+	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_CEACTIO=\
+DEP_CPP_CEKEY=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -15935,44 +23759,175 @@ DEP_CPP_CEACTIO=\
 	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.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\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CEKEY=\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.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"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_CEKEY=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\wiz_he.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_CEACTIO=\
+NODEP_CPP_CEKEY=\
 	"..\..\..\backends\wince\CEActions.h"\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CEKEY=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	
+NODEP_CPP_CEKEY=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -15998,142 +23953,79 @@ NODEP_CPP_CEACTIO=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_CEKEY=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\Actions.h"\
 	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
 	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\message.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_CEKEY=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
+DEP_CPP_CEKEY=\
 	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
-NODEP_CPP_CEACTIO=\
+NODEP_CPP_CEKEY=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\base\options.h"\
 	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -16159,62 +24051,32 @@ NODEP_CPP_CEACTIO=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
+DEP_CPP_CEKEY=\
 	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.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\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
-NODEP_CPP_CEACTIO=\
+NODEP_CPP_CEKEY=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\base\options.h"\
 	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -16240,57 +24102,32 @@ NODEP_CPP_CEACTIO=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
+DEP_CPP_CEKEY=\
 	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
-NODEP_CPP_CEACTIO=\
+NODEP_CPP_CEKEY=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\base\options.h"\
 	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -16316,57 +24153,32 @@ NODEP_CPP_CEACTIO=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
+DEP_CPP_CEKEY=\
 	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
 	
-NODEP_CPP_CEACTIO=\
+NODEP_CPP_CEKEY=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\base\options.h"\
 	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\stdafx.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -16392,120 +24204,12 @@ NODEP_CPP_CEACTIO=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	
-
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEActionsSmartphone.h
+SOURCE=..\..\..\backends\wince\CEKeysDialog.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -16536,45 +24240,62 @@ SOURCE=..\..\..\backends\wince\CEActionsSmartphone.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEDevice.cpp
+SOURCE=..\..\..\backends\wince\CELauncherDialog.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
+DEP_CPP_CELAU=\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
+NODEP_CPP_CELAU=\
+	"..\..\..\backends\wince\backends\fs\fs.h"\
+	"..\..\..\backends\wince\base\engine.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
+	"..\..\..\backends\wince\gui\browser.h"\
+	"..\..\..\backends\wince\gui\launcher.h"\
+	"..\..\..\backends\wince\gui\message.h"\
 	"..\..\..\backends\wince\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CEDEV=\
+DEP_CPP_CELAU=\
 	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	{$(INCLUDE)}"gx.h"\
 	
-NODEP_CPP_CEDEV=\
+NODEP_CPP_CELAU=\
+	"..\..\..\backends\wince\backends\fs\fs.h"\
 	"..\..\..\backends\wince\backends\intern.h"\
 	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\base\engine.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\base\plugins.h"\
 	"..\..\..\backends\wince\CEgui.h"\
 	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
 	"..\..\..\backends\wince\common\scaler.h"\
 	"..\..\..\backends\wince\common\scaler\intern.h"\
 	"..\..\..\backends\wince\common\scummsys.h"\
 	"..\..\..\backends\wince\common\stdafx.h"\
 	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\gui\browser.h"\
+	"..\..\..\backends\wince\gui\launcher.h"\
+	"..\..\..\backends\wince\gui\message.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\gui\widget.h"\
+	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_CEDEV=\
+DEP_CPP_CELAU=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
@@ -16589,28 +24310,44 @@ DEP_CPP_CEDEV=\
 	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_CEDEV=\
+NODEP_CPP_CELAU=\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -16640,7 +24377,8 @@ NODEP_CPP_CEDEV=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_CEDEV=\
+DEP_CPP_CELAU=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
@@ -16656,75 +24394,95 @@ DEP_CPP_CEDEV=\
 	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\Key.h"\
-	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_CEDEV=\
+NODEP_CPP_CELAU=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
+	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
+DEP_CPP_CELAU=\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
+NODEP_CPP_CELAU=\
+	"..\..\..\backends\wince\backends\fs\fs.h"\
+	"..\..\..\backends\wince\base\engine.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
+	"..\..\..\backends\wince\gui\browser.h"\
+	"..\..\..\backends\wince\gui\launcher.h"\
+	"..\..\..\backends\wince\gui\message.h"\
 	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CEDEV=\
+DEP_CPP_CELAU=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
@@ -16738,209 +24496,143 @@ DEP_CPP_CEDEV=\
 	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"gx.h"\
 	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_CELAU=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
-	".\x.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
+DEP_CPP_CELAU=\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
+NODEP_CPP_CELAU=\
+	"..\..\..\backends\wince\backends\fs\fs.h"\
+	"..\..\..\backends\wince\base\engine.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
+	"..\..\..\backends\wince\gui\browser.h"\
+	"..\..\..\backends\wince\gui\launcher.h"\
+	"..\..\..\backends\wince\gui\message.h"\
 	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
+DEP_CPP_CELAU=\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
+NODEP_CPP_CELAU=\
+	"..\..\..\backends\wince\backends\fs\fs.h"\
+	"..\..\..\backends\wince\base\engine.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
+	"..\..\..\backends\wince\gui\browser.h"\
+	"..\..\..\backends\wince\gui\launcher.h"\
+	"..\..\..\backends\wince\gui\message.h"\
 	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\CEDevice.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\wince\CEException.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
+DEP_CPP_CELAU=\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
+NODEP_CPP_CELAU=\
+	"..\..\..\backends\wince\backends\fs\fs.h"\
+	"..\..\..\backends\wince\base\engine.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
+	"..\..\..\backends\wince\gui\browser.h"\
+	"..\..\..\backends\wince\gui\launcher.h"\
+	"..\..\..\backends\wince\gui\message.h"\
+	"..\..\..\backends\wince\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
+DEP_CPP_CELAU=\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
+	
+NODEP_CPP_CELAU=\
+	"..\..\..\backends\wince\backends\fs\fs.h"\
+	"..\..\..\backends\wince\base\engine.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
+	"..\..\..\backends\wince\gui\browser.h"\
+	"..\..\..\backends\wince\gui\launcher.h"\
+	"..\..\..\backends\wince\gui\message.h"\
+	"..\..\..\backends\wince\stdafx.h"\
 	
 
 !ENDIF 
@@ -16948,7 +24640,7 @@ DEP_CPP_CEEXC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEException.h
+SOURCE=..\..\..\backends\wince\CELauncherDialog.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -16979,557 +24671,183 @@ SOURCE=..\..\..\backends\wince\CEException.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEKeysDialog.cpp
+SOURCE=..\..\..\backends\wince\CEScaler.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
+DEP_CPP_CESCA=\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
 	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
+NODEP_CPP_CESCA=\
 	"..\..\..\backends\wince\common\scaler.h"\
 	"..\..\..\backends\wince\common\scaler\intern.h"\
 	"..\..\..\backends\wince\common\scummsys.h"\
 	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
 	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
+DEP_CPP_CESCA=\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	{$(INCLUDE)}"gx.h"\
 	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
+NODEP_CPP_CESCA=\
 	"..\..\..\backends\wince\common\scaler.h"\
 	"..\..\..\backends\wince\common\scaler\intern.h"\
 	"..\..\..\backends\wince\common\scummsys.h"\
 	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
+DEP_CPP_CESCA=\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+NODEP_CPP_CESCA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_CEKEY=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\stdafx.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"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
+	"..\..\..\config.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_CESCA=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_CESCA=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.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"\
-	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
+DEP_CPP_CESCA=\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
 	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
+NODEP_CPP_CESCA=\
 	"..\..\..\backends\wince\common\scaler.h"\
 	"..\..\..\backends\wince\common\scaler\intern.h"\
 	"..\..\..\backends\wince\common\scummsys.h"\
 	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
 	"..\..\..\backends\wince\stdafx.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"\
-	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
+DEP_CPP_CESCA=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
+NODEP_CPP_CESCA=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CESCA=\
+	"..\..\..\backends\wince\CEScaler.h"\
+	
+NODEP_CPP_CESCA=\
 	"..\..\..\backends\wince\common\scaler.h"\
 	"..\..\..\backends\wince\common\scaler\intern.h"\
 	"..\..\..\backends\wince\common\scummsys.h"\
 	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
 	"..\..\..\backends\wince\stdafx.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"\
-	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
+DEP_CPP_CESCA=\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
 	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
+NODEP_CPP_CESCA=\
 	"..\..\..\backends\wince\common\scaler.h"\
 	"..\..\..\backends\wince\common\scaler\intern.h"\
 	"..\..\..\backends\wince\common\scummsys.h"\
 	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
 	"..\..\..\backends\wince\stdafx.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"\
-	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
+DEP_CPP_CESCA=\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
 	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
+NODEP_CPP_CESCA=\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_CESCA=\
+	"..\..\..\backends\wince\CEScaler.h"\
+	
+NODEP_CPP_CESCA=\
 	"..\..\..\backends\wince\common\scaler.h"\
 	"..\..\..\backends\wince\common\scaler\intern.h"\
 	"..\..\..\backends\wince\common\scummsys.h"\
 	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
 	"..\..\..\backends\wince\stdafx.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"\
-	".\x.h"\
 	
 
 !ENDIF 
@@ -17537,7 +24855,7 @@ NODEP_CPP_CEKEY=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEKeysDialog.h
+SOURCE=..\..\..\backends\wince\CEScaler.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -17568,36 +24886,79 @@ SOURCE=..\..\..\backends\wince\CEKeysDialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CELauncherDialog.cpp
+SOURCE=..\..\..\backends\wince\ozone.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\backends\wince\wince-sdl.cpp"
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+DEP_CPP_WINCE=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
 	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
+NODEP_CPP_WINCE=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\base\engine.h"\
 	"..\..\..\backends\wince\base\options.h"\
 	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\common\timer.h"\
+	"..\..\..\backends\wince\common\util.h"\
+	"..\..\..\backends\wince\ItemAction.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\scumm\scumm.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CELAU=\
+DEP_CPP_WINCE=\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+	"..\..\..\backends\wince\CEException.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\ozone.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	{$(INCLUDE)}"gx.h"\
 	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
+NODEP_CPP_WINCE=\
 	"..\..\..\backends\wince\backends\intern.h"\
 	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\base\engine.h"\
@@ -17612,23 +24973,31 @@ NODEP_CPP_CELAU=\
 	"..\..\..\backends\wince\common\stdafx.h"\
 	"..\..\..\backends\wince\common\str.h"\
 	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
+	"..\..\..\backends\wince\common\timer.h"\
+	"..\..\..\backends\wince\common\util.h"\
+	"..\..\..\backends\wince\gui\Actions.h"\
+	"..\..\..\backends\wince\gui\Key.h"\
+	"..\..\..\backends\wince\gui\KeysDialog.h"\
 	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\gui\widget.h"\
+	"..\..\..\backends\wince\ItemAction.h"\
+	"..\..\..\backends\wince\scumm\scumm.h"\
+	"..\..\..\backends\wince\sound\fmopl.h"\
+	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_CELAU=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_WINCE=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEException.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
 	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
 	"..\..\..\backends\wince\CEgui\Panel.h"\
 	"..\..\..\backends\wince\CEgui\PanelItem.h"\
@@ -17638,22 +25007,20 @@ DEP_CPP_CELAU=\
 	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\ozone.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.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\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
@@ -17661,22 +25028,201 @@ DEP_CPP_CELAU=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
 	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\ListWidget.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_CELAU=\
+NODEP_CPP_WINCE=\
+	"..\..\..\backends\wince\CEActions.h"\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\config.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\wiz_he.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"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_WINCE=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEException.h"\
+	"..\..\..\backends\wince\CEgui\CEGUI.h"\
+	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
+	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
+	"..\..\..\backends\wince\CEgui\Panel.h"\
+	"..\..\..\backends\wince\CEgui\PanelItem.h"\
+	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
+	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
+	"..\..\..\backends\wince\CEgui\Toolbar.h"\
+	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
+	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
+	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\ozone.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\fmopl.h"\
+	
+NODEP_CPP_WINCE=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
+	".\orbis\vorbisfile.h"\
+	".\REMOR\vorbis\config_types.h"\
+	".\REMOR\vorbis\ivorbiscodec.h"\
+	".\REMOR\vorbis\ogg.h"\
+	".\REMOR\vorbis\os_types.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_WINCE=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	
+NODEP_CPP_WINCE=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\base\engine.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\common\timer.h"\
+	"..\..\..\backends\wince\common\util.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
+	"..\..\..\backends\wince\gui\message.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\ItemAction.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\scumm\scumm.h"\
+	"..\..\..\backends\wince\sound\fmopl.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -17699,20 +25245,27 @@ NODEP_CPP_CELAU=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_CELAU=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_WINCE=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEException.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
+	"..\..\..\backends\wince\CEgui\ItemAction.h"\
 	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
 	"..\..\..\backends\wince\CEgui\Panel.h"\
 	"..\..\..\backends\wince\CEgui\PanelItem.h"\
@@ -17722,147 +25275,256 @@ DEP_CPP_CELAU=\
 	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
 	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\config_types.h"\
+	"..\..\..\backends\wince\missing\ivorbiscodec.h"\
+	"..\..\..\backends\wince\missing\ogg.h"\
+	"..\..\..\backends\wince\missing\os_types.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
+	"..\..\..\backends\wince\missing\tremor\ivorbisfile.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\ozone.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\main.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\scumm\gfx.h"\
+	"..\..\..\engines\scumm\plugin.h"\
+	"..\..\..\engines\scumm\script.h"\
+	"..\..\..\engines\scumm\scumm.h"\
+	"..\..\..\graphics\colormasks.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
+	"..\..\..\gui\Actions.h"\
 	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\editable.h"\
 	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\KeysDialog.h"\
+	"..\..\..\gui\ListWidget.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CELAU=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_WINCE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+DEP_CPP_WINCE=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
 	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
+NODEP_CPP_WINCE=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\base\engine.h"\
 	"..\..\..\backends\wince\base\options.h"\
 	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
 	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\common\timer.h"\
+	"..\..\..\backends\wince\common\util.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
 	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\ItemAction.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\scumm\scumm.h"\
+	"..\..\..\backends\wince\sound\fmopl.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"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
+	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_WINCE=\
 	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
+NODEP_CPP_WINCE=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\base\engine.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\common\timer.h"\
+	"..\..\..\backends\wince\common\util.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
+	"..\..\..\backends\wince\gui\message.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\ItemAction.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\scumm\scumm.h"\
+	"..\..\..\backends\wince\sound\fmopl.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"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_WINCE=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
+	
+NODEP_CPP_WINCE=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\base\engine.h"\
+	"..\..\..\backends\wince\base\options.h"\
+	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
+	"..\..\..\backends\wince\common\config-manager.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\common\timer.h"\
+	"..\..\..\backends\wince\common\util.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
+	"..\..\..\backends\wince\gui\message.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\ItemAction.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\scumm\scumm.h"\
+	"..\..\..\backends\wince\sound\fmopl.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -17885,160 +25547,301 @@ NODEP_CPP_CELAU=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+DEP_CPP_WINCE=\
+	"..\..\..\backends\wince\CEDevice.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
+	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\wince-sdl.h"\
 	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
+NODEP_CPP_WINCE=\
+	"..\..\..\backends\wince\backends\intern.h"\
+	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\base\engine.h"\
 	"..\..\..\backends\wince\base\options.h"\
 	"..\..\..\backends\wince\base\plugins.h"\
+	"..\..\..\backends\wince\CEActions.h"\
+	"..\..\..\backends\wince\CEgui.h"\
+	"..\..\..\backends\wince\CEkeys.h"\
 	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
+	"..\..\..\backends\wince\common\scaler.h"\
+	"..\..\..\backends\wince\common\scaler\intern.h"\
+	"..\..\..\backends\wince\common\scummsys.h"\
+	"..\..\..\backends\wince\common\stdafx.h"\
+	"..\..\..\backends\wince\common\str.h"\
+	"..\..\..\backends\wince\common\system.h"\
+	"..\..\..\backends\wince\common\timer.h"\
+	"..\..\..\backends\wince\common\util.h"\
+	"..\..\..\backends\wince\gui\dialog.h"\
+	"..\..\..\backends\wince\gui\ListWidget.h"\
 	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+	"..\..\..\backends\wince\gui\newgui.h"\
+	"..\..\..\backends\wince\ItemAction.h"\
+	"..\..\..\backends\wince\Key.h"\
+	"..\..\..\backends\wince\scumm\scumm.h"\
+	"..\..\..\backends\wince\sound\fmopl.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"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
+	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ENDIF 
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+SOURCE="..\..\..\backends\wince\wince-sdl.h"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 !ENDIF 
 
 # End Source File
+# End Group
+# Begin Group "fs"
+
+# PROP Default_Filter ""
+# Begin Group "windows"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CELauncherDialog.h
+SOURCE="..\..\..\backends\fs\windows\windows-fs.cpp"
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
+DEP_CPP_WINDO=\
+	"..\..\..\backends\fs\fs.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\backends\fs\common\list.h"\
+	"..\..\..\backends\fs\common\str.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
+DEP_CPP_WINDO=\
+	"..\..\..\backends\fs\fs.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\backends\fs\common\array.h"\
+	"..\..\..\backends\fs\common\str.h"\
+	"..\..\..\backends\fs\windows\common\stdafx.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_WINDO=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\config.h"\
+	".\DL_byteorder.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_WINDO=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
+DEP_CPP_WINDO=\
+	"..\..\..\backends\fs\fs.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\backends\fs\common\list.h"\
+	"..\..\..\backends\fs\common\str.h"\
+	"..\..\..\backends\fs\windows\stdafx.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
+DEP_CPP_WINDO=\
+	"..\..\..\backends\fs\abstract-fs.h"\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_WINDO=\
+	"..\..\..\backends\fs\fs.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\backends\fs\common\list.h"\
+	"..\..\..\backends\fs\common\str.h"\
+	"..\..\..\backends\fs\windows\stdafx.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_WINDO=\
+	"..\..\..\backends\fs\fs.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\backends\fs\common\list.h"\
+	"..\..\..\backends\fs\common\str.h"\
+	"..\..\..\backends\fs\windows\stdafx.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
+DEP_CPP_WINDO=\
+	"..\..\..\backends\fs\fs.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\backends\fs\common\list.h"\
+	"..\..\..\backends\fs\common\str.h"\
+	"..\..\..\backends\fs\windows\stdafx.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
+DEP_CPP_WINDO=\
+	"..\..\..\backends\fs\fs.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\backends\fs\common\list.h"\
+	"..\..\..\backends\fs\common\str.h"\
+	"..\..\..\backends\fs\windows\stdafx.h"\
+	
+
 !ENDIF 
 
 # End Source File
+# End Group
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEScaler.cpp
+SOURCE=..\..\..\backends\fs\fs.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
+DEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\fs.h"\
 	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+NODEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\common\array.h"\
+	"..\..\..\backends\fs\common\str.h"\
+	"..\..\..\backends\fs\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
-	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
+NODEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\backends\fs\fs.h"\
+	"..\..\..\backends\fs\common\stdafx.h"\
+	"..\..\..\backends\fs\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
+DEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_CESCA=\
+NODEP_CPP_FS_CP=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\config.h"\
@@ -18048,123 +25851,143 @@ NODEP_CPP_CESCA=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_CESCA=\
+DEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CESCA=\
+NODEP_CPP_FS_CP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
+DEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\abstract-fs.h"\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+NODEP_CPP_FS_CP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
+DEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\abstract-fs.h"\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
 	
-NODEP_CPP_CESCA=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_FS_CP=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
+DEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\abstract-fs.h"\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+NODEP_CPP_FS_CP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
+DEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\abstract-fs.h"\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+NODEP_CPP_FS_CP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
+DEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+NODEP_CPP_FS_CP=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\config.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
+DEP_CPP_FS_CP=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+NODEP_CPP_FS_CP=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\config.h"\
 	
 
 !ENDIF 
@@ -18172,7 +25995,7 @@ NODEP_CPP_CESCA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\CEScaler.h
+SOURCE=..\..\..\backends\fs\fs.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -18201,9 +26024,13 @@ SOURCE=..\..\..\backends\wince\CEScaler.h
 !ENDIF 
 
 # End Source File
+# End Group
+# Begin Group "midi"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\backends\wince\ozone.h
+SOURCE=..\..\..\sound\null.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -18211,166 +26038,271 @@ SOURCE=..\..\..\backends\wince\ozone.h
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
+DEP_CPP_NULL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_NULL_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
+DEP_CPP_NULL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_NULL_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_NULL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_NULL_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_NULL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_NULL_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
+DEP_CPP_NULL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_NULL_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
+DEP_CPP_NULL_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mpu401.h"\
+	
+NODEP_CPP_NULL_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ENDIF 
 
 # End Source File
+# End Group
+# Begin Group "sdl"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE="..\..\..\backends\wince\wince-sdl.cpp"
+SOURCE=..\..\..\backends\sdl\events.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
+NODEP_CPP_EVENTS=\
+	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\sdl\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEException.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\ozone.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	{$(INCLUDE)}"gx.h"\
-	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\Actions.h"\
-	"..\..\..\backends\wince\gui\Key.h"\
-	"..\..\..\backends\wince\gui\KeysDialog.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
+NODEP_CPP_EVENTS=\
+	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\sdl\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_WINCE=\
+DEP_CPP_EVENTS=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEException.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\ozone.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.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\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_EVENTS=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
 	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\config.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 ARMV4) Debug"
+
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_EVENTS=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
+NODEP_CPP_EVENTS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_EVENTS=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_EVENTS=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -18394,152 +26326,74 @@ NODEP_CPP_WINCE=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_WINCE=\
+DEP_CPP_EVENTS=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEException.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\ozone.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\editable.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\KeysDialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\fmopl.h"\
-	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"TREMOR\vorbis\config_types.h"\
-	{$(INCLUDE)}"TREMOR\vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"TREMOR\vorbis\ogg.h"\
-	{$(INCLUDE)}"TREMOR\vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
-NODEP_CPP_WINCE=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_EVENTS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
+DEP_CPP_EVENTS=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
+NODEP_CPP_EVENTS=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -18562,82 +26416,141 @@ NODEP_CPP_WINCE=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_WINCE=\
+DEP_CPP_EVENTS=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_EVENTS=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.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"
+
+DEP_CPP_EVENTS=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_EVENTS=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_EVENTS=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_EVENTS=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\backends\sdl\graphics.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_GRAPH=\
+	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\sdl\common\scaler.h"\
+	"..\..\..\backends\sdl\common\util.h"\
+	"..\..\..\backends\sdl\graphics\font.h"\
+	"..\..\..\backends\sdl\graphics\fontman.h"\
+	"..\..\..\backends\sdl\graphics\surface.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_GRAPH=\
+	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\sdl\common\scaler.h"\
+	"..\..\..\backends\sdl\common\util.h"\
+	"..\..\..\backends\sdl\graphics\font.h"\
+	"..\..\..\backends\sdl\graphics\fontman.h"\
+	"..\..\..\backends\sdl\graphics\surface.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+# PROP Intermediate_Dir "ARMV4Rel\backend"
+DEP_CPP_GRAPH=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEException.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\ozone.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.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\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\sound\fmopl.h"\
 	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_GRAPH=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
 	".\DL.h"\
 	".\DL_active.h"\
@@ -18661,112 +26574,82 @@ NODEP_CPP_WINCE=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
+# PROP Intermediate_Dir "ARMV4Dbg\backend"
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
+NODEP_CPP_GRAPH=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
 	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.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"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.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"\
 	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
+NODEP_CPP_GRAPH=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.h"\
+	"..\..\..\gui\font.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -18789,48 +26672,82 @@ NODEP_CPP_WINCE=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
+NODEP_CPP_GRAPH=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.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"\
+	
+NODEP_CPP_GRAPH=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.h"\
+	"..\..\..\gui\font.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -18853,48 +26770,29 @@ NODEP_CPP_WINCE=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.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"\
 	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\options.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
+NODEP_CPP_GRAPH=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.h"\
+	"..\..\..\gui\font.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -18917,312 +26815,466 @@ NODEP_CPP_WINCE=\
 	".\DL_video.h"\
 	".\egin_code.h"\
 	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\backends\wince\wince-sdl.h"
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_GRAPH=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
+DEP_CPP_GRAPH=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_GRAPH=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.h"\
+	
+
 !ENDIF 
 
 # End Source File
-# End Group
-# Begin Group "fs"
-
-# PROP Default_Filter ""
-# Begin Group "windows"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE="..\..\..\backends\fs\windows\windows-fs.cpp"
+SOURCE="..\..\..\backends\sdl\sdl-common.h"
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\array.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\common\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=..\..\..\backends\fs\fs.cpp
+SOURCE=..\..\..\backends\sdl\sdl.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-DEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\common\array.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\stdafx.h"\
+
+NODEP_CPP_SDL_C=\
+	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\sdl\common\config-manager.h"\
+	"..\..\..\backends\sdl\common\util.h"\
+	"..\..\..\backends\sdl\config.h"\
+	"..\..\..\backends\sdl\scummvm.xpm"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\backends\fs\fs.h"\
-	"..\..\..\backends\fs\common\stdafx.h"\
-	"..\..\..\backends\fs\common\util.h"\
+NODEP_CPP_SDL_C=\
+	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\sdl\common\config-manager.h"\
+	"..\..\..\backends\sdl\common\util.h"\
+	"..\..\..\backends\sdl\config.h"\
+	"..\..\..\backends\sdl\scummvm.xpm"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 # PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_SDL_C=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\icons\scummvm.xpm"\
 	
-NODEP_CPP_FS_CP=\
+NODEP_CPP_SDL_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.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 ARMV4) Debug"
 
 # PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_SDL_C=\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\icons\scummvm.xpm"\
 	
-NODEP_CPP_FS_CP=\
+NODEP_CPP_SDL_C=\
+	"..\..\..\backends\sdl\config.h"\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler.h"\
+	".\DL.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
+DEP_CPP_SDL_C=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\list.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"\
+	"..\..\..\icons\scummvm.xpm"\
+	
+NODEP_CPP_SDL_C=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.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"
 
+DEP_CPP_SDL_C=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\begin_code.h"\
+	"..\..\..\backends\wince\missing\close_code.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL.h"\
+	"..\..\..\backends\wince\missing\SDL_active.h"\
+	"..\..\..\backends\wince\missing\SDL_audio.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\SDL_cdrom.h"\
+	"..\..\..\backends\wince\missing\SDL_error.h"\
+	"..\..\..\backends\wince\missing\SDL_events.h"\
+	"..\..\..\backends\wince\missing\SDL_getenv.h"\
+	"..\..\..\backends\wince\missing\SDL_joystick.h"\
+	"..\..\..\backends\wince\missing\SDL_keyboard.h"\
+	"..\..\..\backends\wince\missing\SDL_keysym.h"\
+	"..\..\..\backends\wince\missing\SDL_main.h"\
+	"..\..\..\backends\wince\missing\SDL_mouse.h"\
+	"..\..\..\backends\wince\missing\SDL_mutex.h"\
+	"..\..\..\backends\wince\missing\SDL_quit.h"\
+	"..\..\..\backends\wince\missing\SDL_rwops.h"\
+	"..\..\..\backends\wince\missing\SDL_timer.h"\
+	"..\..\..\backends\wince\missing\SDL_types.h"\
+	"..\..\..\backends\wince\missing\SDL_version.h"\
+	"..\..\..\backends\wince\missing\SDL_video.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\main.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\scaler.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\icons\scummvm.xpm"\
+	
+NODEP_CPP_SDL_C=\
+	"..\..\..\backends\sdl\SymbianOs.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SDL_C=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\list.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"\
+	"..\..\..\icons\scummvm.xpm"\
+	
+NODEP_CPP_SDL_C=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.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) Release"
 
+DEP_CPP_SDL_C=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\list.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"\
+	"..\..\..\icons\scummvm.xpm"\
+	
+NODEP_CPP_SDL_C=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.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"
 
-DEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_SDL_C=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.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"\
+	"..\..\..\icons\scummvm.xpm"\
 	
-NODEP_CPP_FS_CP=\
+NODEP_CPP_SDL_C=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\fs.h"\
+
+DEP_CPP_SDL_C=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.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"\
+	"..\..\..\icons\scummvm.xpm"\
 	
-NODEP_CPP_FS_CP=\
+NODEP_CPP_SDL_C=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
 	
 
 !ENDIF 
 
 # End Source File
+# End Group
 # Begin Source File
 
-SOURCE=..\..\..\backends\fs\fs.h
+SOURCE=..\..\..\backends\intern.h
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
@@ -19252,692 +27304,641 @@ SOURCE=..\..\..\backends\fs\fs.h
 
 # End Source File
 # End Group
-# Begin Group "midi"
+# Begin Group "base"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\backends\midi\null.cpp
+SOURCE=..\..\..\base\commandLine.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_NULL_=\
-	"..\..\..\backends\midi\common\stdafx.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_NULL_=\
-	"..\..\..\backends\midi\common\stdafx.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_NULL_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_NULL_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_NULL_=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_COMMA=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\base\commandLine.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_NULL_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_COMMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_NULL_=\
+DEP_CPP_COMMA=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\commandLine.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_NULL_=\
+NODEP_CPP_COMMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_NULL_=\
+DEP_CPP_COMMA=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\commandLine.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_NULL_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "sdl"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\backends\sdl\events.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_EVENTS=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_EVENTS=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_EVENTS=\
+NODEP_CPP_COMMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_COMMA=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\base\commandLine.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_EVENTS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_COMMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	
-NODEP_CPP_EVENTS=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.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"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_COMMA=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\commandLine.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_EVENTS=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_COMMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_COMMA=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\commandLine.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_EVENTS=\
+NODEP_CPP_COMMA=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ENDIF 
 
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\base\commandLine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\base\engine.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_ENGIN=\
+	"..\..\..\base\base\engine.h"\
+	"..\..\..\base\base\options.h"\
+	"..\..\..\base\common\config-manager.h"\
+	"..\..\..\base\common\file.h"\
+	"..\..\..\base\common\savefile.h"\
+	"..\..\..\base\common\stdafx.h"\
+	"..\..\..\base\common\system.h"\
+	"..\..\..\base\common\timer.h"\
+	"..\..\..\base\gui\message.h"\
+	"..\..\..\base\sound\mixer.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_ENGIN=\
+	"..\..\..\base\base\engine.h"\
+	"..\..\..\base\base\options.h"\
+	"..\..\..\base\common\config-manager.h"\
+	"..\..\..\base\common\file.h"\
+	"..\..\..\base\common\savefile.h"\
+	"..\..\..\base\common\stdafx.h"\
+	"..\..\..\base\common\system.h"\
+	"..\..\..\base\common\timer.h"\
+	"..\..\..\base\gui\message.h"\
+	"..\..\..\base\sound\mixer.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_ENGIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.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"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_EVENTS=\
+NODEP_CPP_ENGIN=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.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"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_ENGIN=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_EVENTS=\
+NODEP_CPP_ENGIN=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_ENGIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_EVENTS=\
+NODEP_CPP_ENGIN=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
+	".\DL_byteorder.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\sdl\graphics.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_GRAPH=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\scaler.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	"..\..\..\backends\sdl\graphics\font.h"\
-	"..\..\..\backends\sdl\graphics\fontman.h"\
-	"..\..\..\backends\sdl\graphics\surface.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_GRAPH=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\scaler.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	"..\..\..\backends\sdl\graphics\font.h"\
-	"..\..\..\backends\sdl\graphics\fontman.h"\
-	"..\..\..\backends\sdl\graphics\surface.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_ENGIN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.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"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GRAPH=\
+NODEP_CPP_ENGIN=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_ENGIN=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\config-manager.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\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_ENGIN=\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.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 ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_ENGIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\config-manager.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\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GRAPH=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ENGIN=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
+	"..\..\..\config.h"\
+	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_ENGIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GRAPH=\
+NODEP_CPP_ENGIN=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
-	"..\..\..\gui\font.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"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_ENGIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.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"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GRAPH=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_ENGIN=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.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"
+!ENDIF 
 
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\base\engine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\base\main.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_MAIN_=\
+	"..\..\..\base\allegro.h"\
+	"..\..\..\base\args.h"\
+	"..\..\..\base\backends\dc\DCLauncherDialog.h"\
+	"..\..\..\base\backends\wince\CELauncherDialog.h"\
+	"..\..\..\base\base\engine.h"\
+	"..\..\..\base\base\options.h"\
+	"..\..\..\base\base\plugins.h"\
+	"..\..\..\base\base\version.h"\
+	"..\..\..\base\common\config-manager.h"\
+	"..\..\..\base\common\file.h"\
+	"..\..\..\base\common\stdafx.h"\
+	"..\..\..\base\common\system.h"\
+	"..\..\..\base\common\timer.h"\
+	"..\..\..\base\gui\Actions.h"\
+	"..\..\..\base\gui\launcher.h"\
+	"..\..\..\base\gui\message.h"\
+	"..\..\..\base\gui\newgui.h"\
+	"..\..\..\base\sound\mididrv.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_MAIN_=\
+	"..\..\..\base\allegro.h"\
+	"..\..\..\base\args.h"\
+	"..\..\..\base\backends\dc\DCLauncherDialog.h"\
+	"..\..\..\base\backends\wince\CELauncherDialog.h"\
+	"..\..\..\base\base\engine.h"\
+	"..\..\..\base\base\options.h"\
+	"..\..\..\base\base\plugins.h"\
+	"..\..\..\base\base\version.h"\
+	"..\..\..\base\common\config-manager.h"\
+	"..\..\..\base\common\file.h"\
+	"..\..\..\base\common\stdafx.h"\
+	"..\..\..\base\common\system.h"\
+	"..\..\..\base\common\timer.h"\
+	"..\..\..\base\gui\Actions.h"\
+	"..\..\..\base\gui\launcher.h"\
+	"..\..\..\base\gui\message.h"\
+	"..\..\..\base\gui\newgui.h"\
+	"..\..\..\base\sound\mididrv.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_MAIN_=\
+	"..\..\..\backends\dc\DCLauncherDialog.h"\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
 	
-NODEP_CPP_GRAPH=\
+NODEP_CPP_MAIN_=\
+	"..\..\..\base\allegro.h"\
+	"..\..\..\base\args.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\config.h"\
-	"..\..\..\gui\font.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -19962,174 +27963,114 @@ NODEP_CPP_GRAPH=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_MAIN_=\
+	"..\..\..\backends\dc\DCLauncherDialog.h"\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_GRAPH=\
+NODEP_CPP_MAIN_=\
+	"..\..\..\base\allegro.h"\
+	"..\..\..\base\args.h"\
+	"..\..\..\base\options.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\font.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
 	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
+	".\DL\begin_code.h"\
+	".\DL\close_code.h"\
+	".\DL\SDL_active.h"\
+	".\DL\SDL_audio.h"\
+	".\DL\SDL_cdrom.h"\
+	".\DL\SDL_error.h"\
+	".\DL\SDL_events.h"\
+	".\DL\SDL_getenv.h"\
+	".\DL\SDL_joystick.h"\
+	".\DL\SDL_keyboard.h"\
+	".\DL\SDL_keysym.h"\
+	".\DL\SDL_main.h"\
+	".\DL\SDL_mouse.h"\
+	".\DL\SDL_mutex.h"\
+	".\DL\SDL_quit.h"\
+	".\DL\SDL_rwops.h"\
+	".\DL\SDL_timer.h"\
+	".\DL\SDL_types.h"\
+	".\DL\SDL_version.h"\
+	".\DL\SDL_video.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"
-
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	
-NODEP_CPP_GRAPH=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
 	
-NODEP_CPP_GRAPH=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\backends\sdl\sdl-common.h"
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\sdl\sdl.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SDL_C=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\config-manager.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	"..\..\..\backends\sdl\config.h"\
-	"..\..\..\backends\sdl\scummvm.xpm"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SDL_C=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\config-manager.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	"..\..\..\backends\sdl\config.h"\
-	"..\..\..\backends\sdl\scummvm.xpm"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_MAIN_=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\list.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"\
-	"..\..\..\icons\scummvm.xpm"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
 	
-NODEP_CPP_SDL_C=\
+NODEP_CPP_MAIN_=\
+	"..\..\..\base\allegro.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
+	"..\..\..\gui\font.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -20154,85 +28095,96 @@ NODEP_CPP_SDL_C=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
+DEP_CPP_MAIN_=\
+	"..\..\..\backends\dc\DCLauncherDialog.h"\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\commandLine.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\icons\scummvm.xpm"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\gui\Actions.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\Key.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SDL_C=\
-	"..\..\..\backends\sdl\config.h"\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MAIN_=\
+	"..\..\..\base\args.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_MAIN_=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\config-manager.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\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\icons\scummvm.xpm"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
 	
-NODEP_CPP_SDL_C=\
+NODEP_CPP_MAIN_=\
+	"..\..\..\base\allegro.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
+	"..\..\..\gui\font.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -20257,33 +28209,40 @@ NODEP_CPP_SDL_C=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_MAIN_=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\list.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"\
-	"..\..\..\icons\scummvm.xpm"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
 	
-NODEP_CPP_SDL_C=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_MAIN_=\
+	"..\..\..\base\allegro.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
+	"..\..\..\gui\font.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -20308,30 +28267,40 @@ NODEP_CPP_SDL_C=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_MAIN_=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\config-manager.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\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\icons\scummvm.xpm"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
 	
-NODEP_CPP_SDL_C=\
+NODEP_CPP_MAIN_=\
+	"..\..\..\base\allegro.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
+	"..\..\..\gui\font.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -20356,30 +28325,40 @@ NODEP_CPP_SDL_C=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
+DEP_CPP_MAIN_=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\config-manager.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\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\icons\scummvm.xpm"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\launcher.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
 	
-NODEP_CPP_SDL_C=\
+NODEP_CPP_MAIN_=\
+	"..\..\..\base\allegro.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
+	"..\..\..\gui\font.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -20404,375 +28383,239 @@ NODEP_CPP_SDL_C=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\icons\scummvm.xpm"\
-	
-NODEP_CPP_SDL_C=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\icons\scummvm.xpm"\
-	
-NODEP_CPP_SDL_C=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\backends\intern.h
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-# PROP Intermediate_Dir "ARMV4Rel\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-# PROP Intermediate_Dir "ARMV4Dbg\backend"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
 !ENDIF 
 
 # End Source File
-# End Group
-# Begin Group "base"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\base\engine.cpp
+SOURCE=..\..\..\base\plugins.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ENGIN=\
+NODEP_CPP_PLUGI=\
+	"..\..\..\base\backends\fs\fs.h"\
 	"..\..\..\base\base\engine.h"\
 	"..\..\..\base\base\options.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\common\file.h"\
-	"..\..\..\base\common\savefile.h"\
+	"..\..\..\base\base\plugins.h"\
 	"..\..\..\base\common\stdafx.h"\
-	"..\..\..\base\common\system.h"\
-	"..\..\..\base\common\timer.h"\
-	"..\..\..\base\gui\message.h"\
-	"..\..\..\base\sound\mixer.h"\
+	"..\..\..\base\common\util.h"\
+	"..\..\..\base\dcloader.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ENGIN=\
+NODEP_CPP_PLUGI=\
+	"..\..\..\base\backends\fs\fs.h"\
 	"..\..\..\base\base\engine.h"\
 	"..\..\..\base\base\options.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\common\file.h"\
-	"..\..\..\base\common\savefile.h"\
+	"..\..\..\base\base\plugins.h"\
 	"..\..\..\base\common\stdafx.h"\
-	"..\..\..\base\common\system.h"\
-	"..\..\..\base\common\timer.h"\
-	"..\..\..\base\gui\message.h"\
-	"..\..\..\base\sound\mixer.h"\
+	"..\..\..\base\common\util.h"\
+	"..\..\..\base\dcloader.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ENGIN=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.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"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ENGIN=\
+NODEP_CPP_PLUGI=\
+	"..\..\..\base\dcloader.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\config.h"\
 	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_ENGIN=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_ENGIN=\
+NODEP_CPP_PLUGI=\
+	"..\..\..\base\dcloader.h"\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_ENGIN=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ENGIN=\
+NODEP_CPP_PLUGI=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
 	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ENGIN=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ENGIN=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_PLUGI=\
+	"..\..\..\base\dcloader.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_ENGIN=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ENGIN=\
+NODEP_CPP_PLUGI=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
 	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ENGIN=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ENGIN=\
+NODEP_CPP_PLUGI=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
 	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ENGIN=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ENGIN=\
+NODEP_CPP_PLUGI=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
 	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ENGIN=\
+DEP_CPP_PLUGI=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ENGIN=\
+NODEP_CPP_PLUGI=\
+	"..\..\..\base\options.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\config.h"\
 	".\DL_byteorder.h"\
 	
@@ -20782,294 +28625,138 @@ NODEP_CPP_ENGIN=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\base\engine.h
+SOURCE=..\..\..\base\plugins.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\base\options.cpp
+SOURCE=..\..\..\base\version.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_GAMED=\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\options.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\base\version.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\common\stdafx.h"\
-	"..\..\..\base\common\system.h"\
-	"..\..\..\base\config.h"\
-	"..\..\..\base\sound\mididrv.h"\
-	"..\..\..\base\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_GAMED=\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\options.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\base\version.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\common\stdafx.h"\
-	"..\..\..\base\common\system.h"\
-	"..\..\..\base\config.h"\
-	"..\..\..\base\sound\mididrv.h"\
-	"..\..\..\base\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_GAMED=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_GAMED=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_GAMED=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_VERSI=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\symbian\src\main_features.inl"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
+	"..\..\..\base\internal_version.h"\
 	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_GAMED=\
-	"..\..\..\base\config.h"\
-	"..\..\..\common\config.h"\
+NODEP_CPP_VERSI=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_GAMED=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_GAMED=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_GAMED=\
+DEP_CPP_VERSI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\symbian\src\main_features.inl"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
+	"..\..\..\base\internal_version.h"\
 	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.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"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GAMED=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_VERSI=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_GAMED=\
+DEP_CPP_VERSI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\symbian\src\main_features.inl"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\base\internal_version.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GAMED=\
+NODEP_CPP_VERSI=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_GAMED=\
+DEP_CPP_VERSI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\symbian\src\main_features.inl"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\base\internal_version.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GAMED=\
+NODEP_CPP_VERSI=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_GAMED=\
+DEP_CPP_VERSI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\symbian\src\main_features.inl"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\base\internal_version.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GAMED=\
+NODEP_CPP_VERSI=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_GAMED=\
+DEP_CPP_VERSI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\symbian\src\main_features.inl"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\base\internal_version.h"\
+	"..\..\..\base\version.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_GAMED=\
+NODEP_CPP_VERSI=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -21077,552 +28764,311 @@ NODEP_CPP_GAMED=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\base\options.h
+SOURCE=..\..\..\base\version.h
 # End Source File
+# End Group
+# Begin Group "graphics"
+
+# PROP Default_Filter ""
+# Begin Group "fonts"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\base\main.cpp
+SOURCE=..\..\..\graphics\fonts\consolefont.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\base\args.h"\
-	"..\..\..\base\backends\dc\DCLauncherDialog.h"\
-	"..\..\..\base\backends\wince\CELauncherDialog.h"\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\options.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\base\version.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\common\file.h"\
-	"..\..\..\base\common\stdafx.h"\
-	"..\..\..\base\common\system.h"\
-	"..\..\..\base\common\timer.h"\
-	"..\..\..\base\gui\Actions.h"\
-	"..\..\..\base\gui\launcher.h"\
-	"..\..\..\base\gui\message.h"\
-	"..\..\..\base\gui\newgui.h"\
-	"..\..\..\base\sound\mididrv.h"\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CONSOL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_CONSOL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\base\args.h"\
-	"..\..\..\base\backends\dc\DCLauncherDialog.h"\
-	"..\..\..\base\backends\wince\CELauncherDialog.h"\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\options.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\base\version.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\common\file.h"\
-	"..\..\..\base\common\stdafx.h"\
-	"..\..\..\base\common\system.h"\
-	"..\..\..\base\common\timer.h"\
-	"..\..\..\base\gui\Actions.h"\
-	"..\..\..\base\gui\launcher.h"\
-	"..\..\..\base\gui\message.h"\
-	"..\..\..\base\gui\newgui.h"\
-	"..\..\..\base\sound\mididrv.h"\
+DEP_CPP_CONSOL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_CONSOL=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\dc\DCLauncherDialog.h"\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+DEP_CPP_CONSOL=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
 	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\base\args.h"\
+NODEP_CPP_CONSOL=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CONSOL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_CONSOL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CONSOL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_CONSOL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\dc\DCLauncherDialog.h"\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_CONSOL=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\Actions.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\Key.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL.h"\
-	{$(INCLUDE)}"SDL\begin_code.h"\
-	{$(INCLUDE)}"SDL\close_code.h"\
-	{$(INCLUDE)}"SDL\SDL_active.h"\
-	{$(INCLUDE)}"SDL\SDL_audio.h"\
-	{$(INCLUDE)}"SDL\SDL_cdrom.h"\
-	{$(INCLUDE)}"SDL\SDL_error.h"\
-	{$(INCLUDE)}"SDL\SDL_events.h"\
-	{$(INCLUDE)}"SDL\SDL_getenv.h"\
-	{$(INCLUDE)}"SDL\SDL_joystick.h"\
-	{$(INCLUDE)}"SDL\SDL_keyboard.h"\
-	{$(INCLUDE)}"SDL\SDL_keysym.h"\
-	{$(INCLUDE)}"SDL\SDL_main.h"\
-	{$(INCLUDE)}"SDL\SDL_mouse.h"\
-	{$(INCLUDE)}"SDL\SDL_mutex.h"\
-	{$(INCLUDE)}"SDL\SDL_quit.h"\
-	{$(INCLUDE)}"SDL\SDL_rwops.h"\
-	{$(INCLUDE)}"SDL\SDL_timer.h"\
-	{$(INCLUDE)}"SDL\SDL_types.h"\
-	{$(INCLUDE)}"SDL\SDL_version.h"\
-	{$(INCLUDE)}"SDL\SDL_video.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\base\args.h"\
+NODEP_CPP_CONSOL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\graphics\fonts\newfont.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+DEP_CPP_NEWFO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
+NODEP_CPP_NEWFO=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\font.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"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+DEP_CPP_NEWFO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
 	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_NEWFO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.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"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+DEP_CPP_NEWFO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
+NODEP_CPP_NEWFO=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\font.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"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+DEP_CPP_NEWFO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
+NODEP_CPP_NEWFO=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\font.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"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+DEP_CPP_NEWFO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
+NODEP_CPP_NEWFO=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\font.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"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
+DEP_CPP_NEWFO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
+NODEP_CPP_NEWFO=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\font.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"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -21630,252 +29076,312 @@ NODEP_CPP_MAIN_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\base\plugins.cpp
+SOURCE=..\..\..\graphics\fonts\newfont_big.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_PLUGI=\
-	"..\..\..\base\backends\fs\fs.h"\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\options.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\common\stdafx.h"\
-	"..\..\..\base\common\util.h"\
-	"..\..\..\base\dcloader.h"\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_NEWFON=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_NEWFON=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-NODEP_CPP_PLUGI=\
-	"..\..\..\base\backends\fs\fs.h"\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\options.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\common\stdafx.h"\
-	"..\..\..\base\common\util.h"\
-	"..\..\..\base\dcloader.h"\
+DEP_CPP_NEWFON=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_NEWFON=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_NEWFON=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_NEWFON=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_NEWFON=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_NEWFON=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_NEWFON=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_PLUGI=\
-	"..\..\..\base\dcloader.h"\
+NODEP_CPP_NEWFON=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_NEWFON=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_PLUGI=\
-	"..\..\..\base\dcloader.h"\
+NODEP_CPP_NEWFON=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\graphics\fonts\scummfont.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_SCUMM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_PLUGI=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\graphics\fonts\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_SCUMM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_PLUGI=\
-	"..\..\..\base\dcloader.h"\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\graphics\fonts\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_SCUMM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_PLUGI=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\graphics\fonts\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_SCUMM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_PLUGI=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\graphics\fonts\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_SCUMM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_PLUGI=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\graphics\fonts\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_SCUMM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_PLUGI=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\graphics\fonts\scumm_globals.h"\
 	
 
 !ENDIF 
 
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\base\plugins.h
 # End Source File
 # End Group
-# Begin Group "graphics"
-
-# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\..\..\graphics\animation.cpp
@@ -21914,7 +29420,6 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -21931,6 +29436,7 @@ DEP_CPP_ANIMA=\
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\config.h"\
 	".\DL_byteorder.h"\
 	".\peg2dec\mpeg2.h"\
@@ -21946,10 +29452,8 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -21960,14 +29464,16 @@ DEP_CPP_ANIMA=\
 	"..\..\..\graphics\animation.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\common\scaler\intern.h"\
+	".\DL_byteorder.h"\
+	".\peg2dec\mpeg2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -21999,14 +29505,19 @@ NODEP_CPP_ANIMA=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_ANIMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -22015,16 +29526,15 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\animation.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_ANIMA=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	".\peg2dec\mpeg2.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
@@ -22136,95 +29646,141 @@ SOURCE=..\..\..\graphics\animation.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\graphics\consolefont.cpp
+SOURCE=..\..\..\graphics\cursorman.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CONSOL=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CURSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	
+NODEP_CPP_CURSO=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-NODEP_CPP_CONSOL=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
+DEP_CPP_CURSO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	
+NODEP_CPP_CURSO=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CONSOL=\
+DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_CONSOL=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_CURSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CONSOL=\
+DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_CONSOL=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_CURSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CONSOL=\
+DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_CONSOL=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_CURSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
@@ -22232,22 +29788,25 @@ NODEP_CPP_CONSOL=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CONSOL=\
+DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_CONSOL=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_CURSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
@@ -22258,6 +29817,10 @@ NODEP_CPP_CONSOL=\
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\graphics\cursorman.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\graphics\font.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
@@ -22310,13 +29873,13 @@ DEP_CPP_FONT_=\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FONT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -22340,21 +29903,27 @@ NODEP_CPP_FONT_=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 DEP_CPP_FONT_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_FONT_=\
-	"..\..\..\common\compile.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
@@ -22490,104 +30059,293 @@ DEP_CPP_FONTM=\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FONTM=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
+DEP_CPP_FONTM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_FONTM=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
+DEP_CPP_FONTM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_FONTM=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_FONTM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_FONTM=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_FONTM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_FONTM=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_FONTM=\
+DEP_CPP_FONTM=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_FONTM=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\config.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_FONTM=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_FONTM=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\config.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\graphics\fontman.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\graphics\ilbm.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_ILBM_=\
+	"..\..\..\graphics\common\stdafx.h"\
+	"..\..\..\graphics\common\stream.h"\
+	"..\..\..\graphics\graphics\surface.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_ILBM_=\
+	"..\..\..\graphics\common\stdafx.h"\
+	"..\..\..\graphics\common\stream.h"\
+	"..\..\..\graphics\graphics\surface.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_ILBM_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_ILBM_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_ILBM_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_ILBM_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ILBM_=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_FONTM=\
+NODEP_CPP_ILBM_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_FONTM=\
+DEP_CPP_ILBM_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_FONTM=\
+NODEP_CPP_ILBM_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\graphics\fontman.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\graphics\ilbm.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ILBM_=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\common\stream.h"\
-	"..\..\..\graphics\graphics\surface.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ILBM_=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\common\stream.h"\
-	"..\..\..\graphics\graphics\surface.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ILBM_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\surface.h"\
@@ -22599,20 +30357,21 @@ NODEP_CPP_ILBM_=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ILBM_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ILBM_=\
 	"..\..\..\common\config.h"\
@@ -22621,14 +30380,6 @@ NODEP_CPP_ILBM_=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ILBM_=\
@@ -22680,173 +30431,170 @@ SOURCE=..\..\..\graphics\ilbm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\graphics\newfont.cpp
+SOURCE=..\..\..\graphics\paletteman.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_NEWFO=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_NEWFO=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_NEWFO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_NEWFO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_NEWFO=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\paletteman.h"\
 	
-NODEP_CPP_NEWFO=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_PALET=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_NEWFO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_NEWFO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_NEWFO=\
+DEP_CPP_PALET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\paletteman.h"\
 	
-NODEP_CPP_NEWFO=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_PALET=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_NEWFO=\
+DEP_CPP_PALET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\paletteman.h"\
 	
-NODEP_CPP_NEWFO=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_NEWFO=\
+DEP_CPP_PALET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\paletteman.h"\
 	
-NODEP_CPP_NEWFO=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_NEWFO=\
+DEP_CPP_PALET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\paletteman.h"\
 	
-NODEP_CPP_NEWFO=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_NEWFO=\
+DEP_CPP_PALET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\paletteman.h"\
 	
-NODEP_CPP_NEWFO=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -22854,145 +30602,112 @@ NODEP_CPP_NEWFO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\graphics\newfont_big.cpp
+SOURCE=..\..\..\graphics\paletteman.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\graphics\primitives.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_NEWFON=\
+NODEP_CPP_PRIMI=\
 	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
+	"..\..\..\graphics\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_NEWFON=\
+NODEP_CPP_PRIMI=\
 	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
+	"..\..\..\graphics\common\util.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_NEWFON=\
+DEP_CPP_PRIMI=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_NEWFON=\
+NODEP_CPP_PRIMI=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_NEWFON=\
+DEP_CPP_PRIMI=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_NEWFON=\
+NODEP_CPP_PRIMI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_NEWFON=\
+DEP_CPP_PRIMI=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_NEWFON=\
+NODEP_CPP_PRIMI=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_NEWFON=\
+DEP_CPP_PRIMI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_NEWFON=\
+NODEP_CPP_PRIMI=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\graphics\primitives.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PRIMI=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\common\util.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_PRIMI=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\common\util.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PRIMI=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
 	
 NODEP_CPP_PRIMI=\
@@ -23002,17 +30717,17 @@ NODEP_CPP_PRIMI=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_PRIMI=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_PRIMI=\
 	"..\..\..\common\config.h"\
@@ -23021,14 +30736,6 @@ NODEP_CPP_PRIMI=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_PRIMI=\
@@ -23074,183 +30781,147 @@ SOURCE=..\..\..\graphics\primitives.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\graphics\scummfont.cpp
+SOURCE=..\..\..\graphics\scaler.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCUMM=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCUMM=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_SCUMM=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_SCUMM=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCALER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scalebit.h"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SCALER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_SCUMM=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_SCUMM=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCUMM=\
+DEP_CPP_SCALER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scalebit.h"\
 	
-NODEP_CPP_SCUMM=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_SCALER=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCUMM=\
+DEP_CPP_SCALER=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scalebit.h"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SCALER=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCUMM=\
+DEP_CPP_SCALER=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scalebit.h"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SCALER=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCUMM=\
+DEP_CPP_SCALER=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scalebit.h"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SCALER=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\scumm_globals.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCUMM=\
+DEP_CPP_SCALER=\
+	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\colormasks.h"\
+	"..\..\..\graphics\scaler\intern.h"\
+	"..\..\..\graphics\scaler\scalebit.h"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SCALER=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\scumm_globals.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
 !ENDIF 
@@ -23258,6 +30929,10 @@ NODEP_CPP_SCUMM=\
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\graphics\scaler.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\graphics\surface.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
@@ -23309,23 +30984,104 @@ DEP_CPP_SURFA=\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\primitives.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SURFA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
+DEP_CPP_SURFA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\primitives.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_SURFA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
+DEP_CPP_SURFA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\primitives.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_SURFA=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SURFA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\primitives.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_SURFA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SURFA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\primitives.h"\
+	"..\..\..\graphics\surface.h"\
+	
+NODEP_CPP_SURFA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SURFA=\
@@ -23369,10 +31125,6 @@ SOURCE=..\..\..\graphics\surface.h
 # End Source File
 # End Group
 # End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
 # Begin Group "Resource Files"
 
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
diff --git a/dists/msevc4/simon/simon.vcp b/dists/msevc4/simon/simon.vcp
index fd7a0de6d7..b15ffcae45 100644
--- a/dists/msevc4/simon/simon.vcp
+++ b/dists/msevc4/simon/simon.vcp
@@ -55,15 +55,15 @@ CFG=simon - 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)" == "simon - 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)" == "simon - 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/" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "simon - 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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
 
@@ -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" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /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" /I "../../../engines" /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_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -290,8 +290,8 @@ BSC32=bscmake.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 CPP=shcl.exe
-# 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" /YX /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxs /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" /D "USE_ZLIB" /YX /M$(CECrtMT) /c
+# 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" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -318,337 +318,214 @@ BSC32=bscmake.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\simon\charset.cpp
+SOURCE=..\..\..\engines\simon\animation.cpp
 
 !IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CHARS=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\scumm_globals.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CHARS=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\scumm_globals.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_CHARS=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_CHARS=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_CHARS=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_CHARS=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CHARS=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_CHARS=\
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\animation.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
 
-DEP_CPP_CHARS=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_CHARS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\cursor.cpp
-
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
-
-NODEP_CPP_CURSO=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\scumm_globals.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_CURSO=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\scumm_globals.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CURSO=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_CURSO=\
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\animation.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CURSO=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_CURSO=\
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\animation.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CURSO=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_CURSO=\
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\animation.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
-DEP_CPP_CURSO=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_CURSO=\
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\animation.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
 !ENDIF 
@@ -656,167 +533,121 @@ NODEP_CPP_CURSO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\simon\debug.cpp
+SOURCE=..\..\..\engines\simon\animation.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\simon\charset.cpp
 
-NODEP_CPP_DEBUG=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\simon\debug.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	"..\..\..\simon\simon\vga.h"\
-	
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_DEBUG=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\simon\debug.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	"..\..\..\simon\simon\vga.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_DEBUG=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\debug.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_CHARS=\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
 
-DEP_CPP_DEBUG=\
+DEP_CPP_CHARS=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\debug.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_CHARS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+DEP_CPP_CHARS=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CHARS=\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
 
-DEP_CPP_DEBUG=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\debug.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_CHARS=\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CHARS=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_CHARS=\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
-DEP_CPP_DEBUG=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\debug.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_CHARS=\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
 !ENDIF 
@@ -824,45 +655,23 @@ NODEP_CPP_DEBUG=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\simon\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\debugger.cpp
+SOURCE=..\..\..\engines\simon\cursor.cpp
 
 !IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
 
-NODEP_CPP_DEBUGG=\
-	"..\..\..\simon\common\config-manager.h"\
-	"..\..\..\simon\common\debugger.cpp"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\simon\debugger.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_DEBUGG=\
-	"..\..\..\simon\common\config-manager.h"\
-	"..\..\..\simon\common\debugger.cpp"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\simon\debugger.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_DEBUGG=\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -871,46 +680,30 @@ DEP_CPP_DEBUGG=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\debugger.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_DEBUGG=\
+NODEP_CPP_CURSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
 
-DEP_CPP_DEBUGG=\
+DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -918,56 +711,36 @@ DEP_CPP_DEBUGG=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\debugger.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_DEBUGG=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_CURSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
-
-DEP_CPP_DEBUGG=\
+DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -976,46 +749,25 @@ DEP_CPP_DEBUGG=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\debugger.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_DEBUGG=\
+NODEP_CPP_CURSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
 
-DEP_CPP_DEBUGG=\
+DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\map.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1024,141 +776,107 @@ DEP_CPP_DEBUGG=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\debugger.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_DEBUGG=\
+NODEP_CPP_CURSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\debugger.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\icons.cpp
-
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ICONS=\
-	"..\..\..\simon\common\file.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ICONS=\
-	"..\..\..\simon\common\file.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ICONS=\
+DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_ICONS=\
+NODEP_CPP_CURSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
-DEP_CPP_ICONS=\
+DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_ICONS=\
+NODEP_CPP_CURSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\simon\debug.cpp
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
 
-DEP_CPP_ICONS=\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\engines\simon\simon\debug.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -1166,59 +884,85 @@ DEP_CPP_ICONS=\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\debug.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ICONS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\engines\simon\simon\debug.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\engines\simon\simon\debug.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\engines\simon\simon\debug.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
-DEP_CPP_ICONS=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_ICONS=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_DEBUG=\
+	"..\..\..\engines\simon\simon\debug.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
 	
 
 !ENDIF 
@@ -1226,325 +970,346 @@ NODEP_CPP_ICONS=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\simon\intern.h
+SOURCE=..\..\..\engines\simon\debug.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\simon\items.cpp
+SOURCE=..\..\..\engines\simon\debugger.cpp
 
 !IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ITEMS=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ITEMS=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ITEMS=\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_ITEMS=\
+NODEP_CPP_DEBUGG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\debugger.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
 
-DEP_CPP_ITEMS=\
+DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\debugger.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_ITEMS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_DEBUGG=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
-
-DEP_CPP_ITEMS=\
+DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_ITEMS=\
+NODEP_CPP_DEBUGG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\debugger.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ITEMS=\
+DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_ITEMS=\
+NODEP_CPP_DEBUGG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\debugger.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\midi.cpp
-
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MIDI_=\
-	"..\..\..\simon\common\file.h"\
-	"..\..\..\simon\common\scummsys.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\simon\simon.h"\
-	"..\..\..\simon\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MIDI_=\
-	"..\..\..\simon\common\file.h"\
-	"..\..\..\simon\common\scummsys.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\simon\simon.h"\
-	"..\..\..\simon\sound\mixer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDI_=\
+DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MIDI_=\
+NODEP_CPP_DEBUGG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\debugger.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDI_=\
+DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MIDI_=\
+NODEP_CPP_DEBUGG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\debugger.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\simon\debugger.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\simon\draw.cpp
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
 
-DEP_CPP_MIDI_=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DRAW_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_MIDI_=\
+NODEP_CPP_DRAW_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIDI_=\
+DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -1554,157 +1319,123 @@ DEP_CPP_MIDI_=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_MIDI_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_DRAW_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\midi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\midiparser_s1d.cpp
-
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MIDIP=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\util.h"\
-	"..\..\..\simon\sound\mididrv.h"\
-	"..\..\..\simon\sound\midiparser.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MIDIP=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\util.h"\
-	"..\..\..\simon\sound\mididrv.h"\
-	"..\..\..\simon\sound\midiparser.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MIDIP=\
+DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIP=\
+NODEP_CPP_DRAW_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MIDIP=\
+DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MIDIP=\
+NODEP_CPP_DRAW_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDIP=\
+DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIP=\
+NODEP_CPP_DRAW_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDIP=\
+DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
 	
-NODEP_CPP_MIDIP=\
+NODEP_CPP_DRAW_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
 !ENDIF 
@@ -1712,63 +1443,34 @@ NODEP_CPP_MIDIP=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\simon\res.cpp
+SOURCE=..\..\..\engines\simon\event.cpp
 
 !IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
 
-NODEP_CPP_RES_C=\
-	"..\..\..\simon\common\file.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_RES_C=\
-	"..\..\..\simon\common\file.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_RES_C=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_RES_C=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
 
-DEP_CPP_RES_C=\
+DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -1776,101 +1478,76 @@ DEP_CPP_RES_C=\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_RES_C=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_EVENT=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
 
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
 
-DEP_CPP_RES_C=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_RES_C=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
-DEP_CPP_RES_C=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_RES_C=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
 !ENDIF 
@@ -1878,1018 +1555,2589 @@ NODEP_CPP_RES_C=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\simon\saveload.cpp
+SOURCE=..\..\..\engines\simon\game.cpp
 
 !IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SAVEL=\
-	"..\..\..\simon\common\savefile.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\gui\about.h"\
-	"..\..\..\simon\gui\message.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SAVEL=\
-	"..\..\..\simon\common\savefile.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\gui\about.h"\
-	"..\..\..\simon\gui\message.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SAVEL=\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_GAME_=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\md5.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"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SAVEL=\
+NODEP_CPP_GAME_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
 
-DEP_CPP_SAVEL=\
+DEP_CPP_GAME_=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.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"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SAVEL=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_GAME_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SAVEL=\
+DEP_CPP_GAME_=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\md5.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"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SAVEL=\
+NODEP_CPP_GAME_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SAVEL=\
+DEP_CPP_GAME_=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\md5.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"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SAVEL=\
+NODEP_CPP_GAME_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\simon\simon-md5.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\simon.cpp
-
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SIMON=\
-	"..\..\..\simon\backends\fs\fs.h"\
-	"..\..\..\simon\base\options.h"\
-	"..\..\..\simon\base\plugins.h"\
-	"..\..\..\simon\common\config-manager.h"\
-	"..\..\..\simon\common\file.h"\
-	"..\..\..\simon\common\md5.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\globals.h"\
-	"..\..\..\simon\gui\about.h"\
-	"..\..\..\simon\gui\message.h"\
-	"..\..\..\simon\scumm_globals.h"\
-	"..\..\..\simon\simon\debugger.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon-md5.h"\
-	"..\..\..\simon\simon\simon.h"\
-	"..\..\..\simon\simon\vga.h"\
-	"..\..\..\simon\sound\mididrv.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SIMON=\
-	"..\..\..\simon\backends\fs\fs.h"\
-	"..\..\..\simon\base\options.h"\
-	"..\..\..\simon\base\plugins.h"\
-	"..\..\..\simon\common\config-manager.h"\
-	"..\..\..\simon\common\file.h"\
-	"..\..\..\simon\common\md5.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\globals.h"\
-	"..\..\..\simon\gui\about.h"\
-	"..\..\..\simon\gui\message.h"\
-	"..\..\..\simon\scumm_globals.h"\
-	"..\..\..\simon\simon\debugger.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon-md5.h"\
-	"..\..\..\simon\simon\simon.h"\
-	"..\..\..\simon\simon\vga.h"\
-	"..\..\..\simon\sound\mididrv.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SIMON=\
+DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\md5.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\debugger.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon-md5.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_GAME_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\globals.h"\
-	"..\..\..\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
-DEP_CPP_SIMON=\
+DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\md5.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\debugger.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon-md5.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_GAME_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\globals.h"\
-	"..\..\..\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\simon\icons.cpp
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SIMON=\
-	"..\..\..\backends\fs\fs.h"\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\md5.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\debugger.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon-md5.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\globals.h"\
-	"..\..\..\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
 
-DEP_CPP_SIMON=\
-	"..\..\..\backends\fs\fs.h"\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\md5.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.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"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\simon\debugger.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon-md5.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SIMON=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ICONS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\simon\globals.h"\
-	"..\..\..\simon\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\simon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\sound.cpp
-
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SOUND=\
-	"..\..\..\simon\common\file.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\util.h"\
-	"..\..\..\simon\simon\sound.h"\
-	"..\..\..\simon\sound\flac.h"\
-	"..\..\..\simon\sound\mp3.h"\
-	"..\..\..\simon\sound\voc.h"\
-	"..\..\..\simon\sound\vorbis.h"\
-	"..\..\..\simon\sound\wave.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SOUND=\
-	"..\..\..\simon\common\file.h"\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\util.h"\
-	"..\..\..\simon\simon\sound.h"\
-	"..\..\..\simon\sound\flac.h"\
-	"..\..\..\simon\sound\mp3.h"\
-	"..\..\..\simon\sound\voc.h"\
-	"..\..\..\simon\sound\vorbis.h"\
-	"..\..\..\simon\sound\wave.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SOUND=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\voc.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SOUND=\
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SOUND=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\voc.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SOUND=\
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SOUND=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\voc.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_ICONS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_ICONS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ICONS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\intern.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\items.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ITEMS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ITEMS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\animation.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_ITEMS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_ITEMS=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_ITEMS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ITEMS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\animation.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_ITEMS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ITEMS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\animation.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_ITEMS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ITEMS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\animation.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_ITEMS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ITEMS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\animation.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\midi.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MIDI_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_MIDI_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_MIDI_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_MIDI_=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_MIDI_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_MIDI_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_MIDI_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_MIDI_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_MIDI_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_MIDI_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_MIDI_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_MIDI_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\midi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\midiparser_s1d.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MIDIP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	
+NODEP_CPP_MIDIP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_MIDIP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	
+NODEP_CPP_MIDIP=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_MIDIP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	
+NODEP_CPP_MIDIP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_MIDIP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	
+NODEP_CPP_MIDIP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_MIDIP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	
+NODEP_CPP_MIDIP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_MIDIP=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	
+NODEP_CPP_MIDIP=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\oracle.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ORACL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ORACL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_ORACL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_ORACL=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_ORACL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ORACL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_ORACL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ORACL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_ORACL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ORACL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_ORACL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ORACL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\res.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RES_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_RES_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_RES_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\missing\zconf.h"\
+	"..\..\..\backends\wince\missing\zlib.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_RES_C=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_RES_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_RES_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_RES_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_RES_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_RES_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_RES_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_RES_C=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_RES_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\sound.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\saveload.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SAVEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SAVEL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_SAVEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SAVEL=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SAVEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SAVEL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SAVEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SAVEL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SAVEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SAVEL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_SAVEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_SAVEL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\simon.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SIMON=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_SIMON=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\globals.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\debugger.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_SIMON=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.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"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\debugger.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SIMON=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\globals.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SIMON=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_SIMON=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\globals.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\debugger.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SIMON=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_SIMON=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\globals.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\debugger.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SIMON=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_SIMON=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\globals.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\debugger.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_SIMON=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\about.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_SIMON=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\globals.h"\
+	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\simon\simon\debugger.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\simon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\sound.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\sound.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\adpcm.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\voc.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\sound.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\string.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_STRIN=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_STRIN=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_STRIN=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_STRIN=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_STRIN=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_STRIN=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_STRIN=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_STRIN=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_STRIN=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_STRIN=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_STRIN=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_STRIN=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\subroutine.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SUBRO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SUBRO=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_SUBRO=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SUBRO=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SUBRO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SUBRO=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SUBRO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SUBRO=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SUBRO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SUBRO=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+
+DEP_CPP_SUBRO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SUBRO=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\verb.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_VERB_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_VERB_=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
 
-DEP_CPP_SOUND=\
+DEP_CPP_VERB_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\flac.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\voc.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_VERB_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
-# End Source File
-# Begin Source File
+DEP_CPP_VERB_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_VERB_=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
 
-SOURCE=..\..\..\simon\sound.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
 
-SOURCE=..\..\..\simon\verb.cpp
+DEP_CPP_VERB_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_VERB_=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
 
+DEP_CPP_VERB_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
 NODEP_CPP_VERB_=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
+DEP_CPP_VERB_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
 NODEP_CPP_VERB_=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\simon\vga.cpp
+
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_VERB_=\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_VERB_=\
+NODEP_CPP_VGA_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
 
-DEP_CPP_VERB_=\
+DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_VERB_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_VGA_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
-
-DEP_CPP_VERB_=\
+DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_VERB_=\
+NODEP_CPP_VGA_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
 
-DEP_CPP_VERB_=\
+DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\timer.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_VERB_=\
+NODEP_CPP_VGA_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\vga.cpp
-
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
-
-NODEP_CPP_VGA_C=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	"..\..\..\simon\simon\vga.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_VGA_C=\
-	"..\..\..\simon\common\stdafx.h"\
-	"..\..\..\simon\common\system.h"\
-	"..\..\..\simon\simon\intern.h"\
-	"..\..\..\simon\simon\simon.h"\
-	"..\..\..\simon\simon\vga.h"\
-	
-
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
 
 DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
 DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\simon\simon\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\simon\vga.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\simon\window.cpp
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
 
-DEP_CPP_VGA_C=\
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+
+DEP_CPP_WINDO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+
+DEP_CPP_WINDO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
+	"..\..\..\engines\simon\animation.h"\
+	"..\..\..\engines\simon\intern.h"\
+	"..\..\..\engines\simon\midi.h"\
+	"..\..\..\engines\simon\simon.h"\
+	"..\..\..\engines\simon\sound.h"\
+	"..\..\..\engines\simon\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_VGA_C=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_WINDO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_WINDO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+
+DEP_CPP_WINDO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
+!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+
+DEP_CPP_WINDO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_WINDO=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
+	
+
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
 
-DEP_CPP_VGA_C=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_WINDO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\simon\vga.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_VGA_C=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_WINDO=\
+	"..\..\..\engines\simon\simon\intern.h"\
+	"..\..\..\engines\simon\simon\simon.h"\
 	
 
 !ENDIF 
 
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\..\simon\vga.h
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
 # End Group
 # End Target
 # End Project
diff --git a/dists/msevc4/sky/sky.vcp b/dists/msevc4/sky/sky.vcp
index e742d07788..96bacfd75c 100644
--- a/dists/msevc4/sky/sky.vcp
+++ b/dists/msevc4/sky/sky.vcp
@@ -55,15 +55,15 @@ CFG=sky - 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)" == "sky - 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)" == "sky - 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/" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "sky - 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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
 
@@ -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" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /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" /I "../../../engines" /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_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -290,8 +290,8 @@ BSC32=bscmake.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 CPP=shcl.exe
-# 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" /YX /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxs /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" /D "USE_ZLIB" /YX /M$(CECrtMT) /c
+# 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" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -321,56 +321,44 @@ BSC32=bscmake.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\adlibchannel.cpp
+SOURCE=..\..\..\engines\sky\music\adlibchannel.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ADLIB=\
-	"..\..\..\sky\music\common\stdafx.h"\
-	"..\..\..\sky\music\common\util.h"\
-	"..\..\..\sky\music\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\sky\sky.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ADLIB=\
-	"..\..\..\sky\music\common\stdafx.h"\
-	"..\..\..\sky\music\common\util.h"\
-	"..\..\..\sky\music\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\sky\sky.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_ADLIB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sound\fmopl.h"\
 	
 NODEP_CPP_ADLIB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_ADLIB=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -381,51 +369,81 @@ DEP_CPP_ADLIB=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
+	"..\..\..\engines\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky.h"\
 	"..\..\..\sound\fmopl.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ADLIB=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_ADLIB=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ADLIB=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_ADLIB=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ADLIB=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ADLIB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sound\fmopl.h"\
 	
 NODEP_CPP_ADLIB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -434,24 +452,20 @@ DEP_CPP_ADLIB=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sound\fmopl.h"\
 	
 NODEP_CPP_ADLIB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
 	
 
 !ENDIF 
@@ -459,50 +473,30 @@ NODEP_CPP_ADLIB=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\adlibchannel.h
+SOURCE=..\..\..\engines\sky\music\adlibchannel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\adlibmusic.cpp
+SOURCE=..\..\..\engines\sky\music\adlibmusic.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ADLIBM=\
-	"..\..\..\sky\music\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\sky\music\adlibmusic.h"\
-	"..\..\..\sky\music\sky\sky.h"\
-	"..\..\..\sky\music\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ADLIBM=\
-	"..\..\..\sky\music\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\sky\music\adlibmusic.h"\
-	"..\..\..\sky\music\sky\sky.h"\
-	"..\..\..\sky\music\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_ADLIBM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\adlibmusic.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_ADLIBM=\
@@ -510,12 +504,17 @@ NODEP_CPP_ADLIBM=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_ADLIBM=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -526,50 +525,74 @@ DEP_CPP_ADLIBM=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\adlibmusic.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
+	"..\..\..\engines\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ADLIBM=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_ADLIBM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_ADLIBM=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_ADLIBM=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_ADLIBM=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ADLIBM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\adlibmusic.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_ADLIBM=\
@@ -577,6 +600,9 @@ NODEP_CPP_ADLIBM=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -585,20 +611,10 @@ DEP_CPP_ADLIBM=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\adlibchannel.h"\
-	"..\..\..\sky\music\adlibmusic.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_ADLIBM=\
@@ -606,6 +622,9 @@ NODEP_CPP_ADLIBM=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
 	
 
 !ENDIF 
@@ -613,74 +632,80 @@ NODEP_CPP_ADLIBM=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\adlibmusic.h
+SOURCE=..\..\..\engines\sky\music\adlibmusic.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\gmchannel.cpp
+SOURCE=..\..\..\engines\sky\music\gmchannel.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-DEP_CPP_GMCHA=\
-	"..\..\..\sky\music\gmchannel.h"\
-	
-NODEP_CPP_GMCHA=\
-	"..\..\..\sky\music\common\util.h"\
-	"..\..\..\sky\music\sky\music\musicbase.h"\
-	"..\..\..\sky\music\sound\mididrv.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_GMCHA=\
-	"..\..\..\sky\music\gmchannel.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sky\music\gmchannel.h"\
+	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_GMCHA=\
-	"..\..\..\sky\music\common\util.h"\
-	"..\..\..\sky\music\sky\music\musicbase.h"\
-	"..\..\..\sky\music\sound\mididrv.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\musicbase.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_GMCHA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\musicbase.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_GMCHA=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_GMCHA=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\music\gmchannel.h"\
 	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMCHA=\
 	"..\..\..\common\config.h"\
@@ -688,30 +713,42 @@ NODEP_CPP_GMCHA=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\musicbase.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_GMCHA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sky\music\gmchannel.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_GMCHA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\musicbase.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_GMCHA=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\music\gmchannel.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_GMCHA=\
@@ -720,22 +757,20 @@ NODEP_CPP_GMCHA=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\musicbase.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
 
 DEP_CPP_GMCHA=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\music\gmchannel.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_GMCHA=\
@@ -744,6 +779,7 @@ NODEP_CPP_GMCHA=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\musicbase.h"\
 	
 
 !ENDIF 
@@ -751,51 +787,30 @@ NODEP_CPP_GMCHA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\gmchannel.h
+SOURCE=..\..\..\engines\sky\music\gmchannel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\gmmusic.cpp
+SOURCE=..\..\..\engines\sky\music\gmmusic.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_GMMUS=\
-	"..\..\..\sky\music\common\util.h"\
-	"..\..\..\sky\music\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\sky\music\gmmusic.h"\
-	"..\..\..\sky\music\sky\sky.h"\
-	"..\..\..\sky\music\sound\mididrv.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_GMMUS=\
-	"..\..\..\sky\music\common\util.h"\
-	"..\..\..\sky\music\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\sky\music\gmmusic.h"\
-	"..\..\..\sky\music\sky\sky.h"\
-	"..\..\..\sky\music\sound\mididrv.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_GMMUS=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\gmmusic.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_GMMUS=\
@@ -804,65 +819,96 @@ NODEP_CPP_GMMUS=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_GMMUS=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\gmmusic.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
+	"..\..\..\engines\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky.h"\
 	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GMMUS=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_GMMUS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_GMMUS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_GMMUS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_GMMUS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_GMMUS=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\gmmusic.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_GMMUS=\
@@ -871,27 +917,21 @@ NODEP_CPP_GMMUS=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
 
 DEP_CPP_GMMUS=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\gmmusic.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\sky.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_GMMUS=\
@@ -900,6 +940,9 @@ NODEP_CPP_GMMUS=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\music\sky\sky.h"\
 	
 
 !ENDIF 
@@ -907,50 +950,32 @@ NODEP_CPP_GMMUS=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\gmmusic.h
+SOURCE=..\..\..\engines\sky\music\gmmusic.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\mt32music.cpp
+SOURCE=..\..\..\engines\sky\music\mt32music.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MT32M=\
-	"..\..\..\sky\music\common\system.h"\
-	"..\..\..\sky\music\common\util.h"\
-	"..\..\..\sky\music\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\sky\music\mt32music.h"\
-	"..\..\..\sky\music\sound\mididrv.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MT32M=\
-	"..\..\..\sky\music\common\system.h"\
-	"..\..\..\sky\music\common\util.h"\
-	"..\..\..\sky\music\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\sky\music\mt32music.h"\
-	"..\..\..\sky\music\sound\mididrv.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_MT32M=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\mt32music.h"\
-	"..\..\..\sky\music\musicbase.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_MT32M=\
@@ -959,63 +984,99 @@ NODEP_CPP_MT32M=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\mt32music.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_MT32M=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\mt32music.h"\
-	"..\..\..\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\mt32music.h"\
+	"..\..\..\engines\sky\music\musicbase.h"\
 	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MT32M=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_MT32M=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_MT32M=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\mt32music.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_MT32M=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mididrv.h"\
+	
+NODEP_CPP_MT32M=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\mt32music.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MT32M=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\mt32music.h"\
-	"..\..\..\sky\music\musicbase.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_MT32M=\
@@ -1024,26 +1085,22 @@ NODEP_CPP_MT32M=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\mt32music.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
 
 DEP_CPP_MT32M=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\music\gmchannel.h"\
-	"..\..\..\sky\music\mt32music.h"\
-	"..\..\..\sky\music\musicbase.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_MT32M=\
@@ -1052,6 +1109,8 @@ NODEP_CPP_MT32M=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\music\gmchannel.h"\
+	"..\..\..\engines\sky\music\sky\music\mt32music.h"\
 	
 
 !ENDIF 
@@ -1059,131 +1118,132 @@ NODEP_CPP_MT32M=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\mt32music.h
+SOURCE=..\..\..\engines\sky\music\mt32music.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\musicbase.cpp
+SOURCE=..\..\..\engines\sky\music\musicbase.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MUSIC=\
-	"..\..\..\sky\music\common\util.h"\
-	"..\..\..\sky\music\sky\disk.h"\
-	"..\..\..\sky\music\sky\music\musicbase.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MUSIC=\
-	"..\..\..\sky\music\common\util.h"\
-	"..\..\..\sky\music\sky\disk.h"\
-	"..\..\..\sky\music\sky\music\musicbase.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\disk.h"\
+	"..\..\..\engines\sky\music\sky\music\musicbase.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
 	
 NODEP_CPP_MUSIC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_MUSIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_MUSIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\disk.h"\
+	"..\..\..\engines\sky\music\sky\music\musicbase.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_MUSIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_MUSIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\disk.h"\
+	"..\..\..\engines\sky\music\sky\music\musicbase.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\disk.h"\
+	"..\..\..\engines\sky\music\sky\music\musicbase.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
 
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\music\sky\disk.h"\
+	"..\..\..\engines\sky\music\sky\music\musicbase.h"\
 	
 
 !ENDIF 
@@ -1191,68 +1251,52 @@ NODEP_CPP_MUSIC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\music\musicbase.h
+SOURCE=..\..\..\engines\sky\music\musicbase.h
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=..\..\..\sky\autoroute.cpp
+SOURCE=..\..\..\engines\sky\autoroute.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_AUTOR=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\sky\autoroute.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\grid.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\struc.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_AUTOR=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\sky\autoroute.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\grid.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\struc.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_AUTOR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\autoroute.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_AUTOR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\autoroute.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_AUTOR=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -1262,121 +1306,144 @@ DEP_CPP_AUTOR=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\autoroute.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sky\autoroute.h"\
+	"..\..\..\engines\sky\compact.h"\
+	"..\..\..\engines\sky\grid.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\struc.h"\
 	
 NODEP_CPP_AUTOR=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
+DEP_CPP_AUTOR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_AUTOR=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\autoroute.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
 DEP_CPP_AUTOR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\autoroute.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_AUTOR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\autoroute.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_AUTOR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\autoroute.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_AUTOR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\autoroute.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
+
+DEP_CPP_AUTOR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_AUTOR=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\autoroute.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	
+
+!ENDIF 
 
-SOURCE=..\..\..\sky\autoroute.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\compact.cpp
+SOURCE=..\..\..\engines\sky\autoroute.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\sky\compact.cpp
 
-NODEP_CPP_COMPA=\
-	"..\..\..\sky\common\file.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\gui\message.h"\
-	"..\..\..\sky\sky\compact.h"\
-	
+!IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_COMPA=\
-	"..\..\..\sky\common\file.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\gui\message.h"\
-	"..\..\..\sky\sky\compact.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_COMPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -1392,22 +1459,21 @@ DEP_CPP_COMPA=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_COMPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_COMPA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -1420,40 +1486,89 @@ DEP_CPP_COMPA=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sky\compact.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\struc.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COMPA=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_COMPA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_COMPA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_COMPA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_COMPA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_COMPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -1469,16 +1584,13 @@ DEP_CPP_COMPA=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_COMPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -1487,7 +1599,6 @@ DEP_CPP_COMPA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -1503,16 +1614,13 @@ DEP_CPP_COMPA=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_COMPA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
 	
 
 !ENDIF 
@@ -1520,72 +1628,32 @@ NODEP_CPP_COMPA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\compact.h
+SOURCE=..\..\..\engines\sky\compact.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\control.cpp
+SOURCE=..\..\..\engines\sky\control.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CONTR=\
-	"..\..\..\sky\common\config-manager.h"\
-	"..\..\..\sky\common\file.h"\
-	"..\..\..\sky\common\savefile.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\system.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\gui\message.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\control.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\mouse.h"\
-	"..\..\..\sky\sky\music\musicbase.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\sound.h"\
-	"..\..\..\sky\sky\struc.h"\
-	"..\..\..\sky\sky\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CONTR=\
-	"..\..\..\sky\common\config-manager.h"\
-	"..\..\..\sky\common\file.h"\
-	"..\..\..\sky\common\savefile.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\system.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\gui\message.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\control.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\mouse.h"\
-	"..\..\..\sky\sky\music\musicbase.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\sound.h"\
-	"..\..\..\sky\sky\struc.h"\
-	"..\..\..\sky\sky\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -1602,32 +1670,32 @@ DEP_CPP_CONTR=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -1635,7 +1703,8 @@ DEP_CPP_CONTR=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -1646,55 +1715,141 @@ DEP_CPP_CONTR=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sky\compact.h"\
+	"..\..\..\engines\sky\control.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\logic.h"\
+	"..\..\..\engines\sky\mouse.h"\
+	"..\..\..\engines\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\screen.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\sound.h"\
+	"..\..\..\engines\sky\struc.h"\
+	"..\..\..\engines\sky\text.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONTR=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_CONTR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONTR=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_CONTR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONTR=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -1711,26 +1866,24 @@ DEP_CPP_CONTR=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -1739,12 +1892,12 @@ DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
@@ -1761,26 +1914,24 @@ DEP_CPP_CONTR=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
 !ENDIF 
@@ -1788,55 +1939,36 @@ NODEP_CPP_CONTR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\control.h
+SOURCE=..\..\..\engines\sky\control.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\debug.cpp
+SOURCE=..\..\..\engines\sky\debug.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_DEBUG=\
-	"..\..\..\sky\common\debugger.cpp"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\debug.h"\
-	"..\..\..\sky\sky\grid.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\mouse.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\struc.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_DEBUG=\
-	"..\..\..\sky\common\debugger.cpp"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\debug.h"\
-	"..\..\..\sky\sky\grid.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\mouse.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\struc.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.cpp"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1844,6 +1976,7 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
@@ -1853,35 +1986,43 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.cpp"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1889,8 +2030,18 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sky\compact.h"\
+	"..\..\..\engines\sky\debug.h"\
+	"..\..\..\engines\sky\grid.h"\
+	"..\..\..\engines\sky\logic.h"\
+	"..\..\..\engines\sky\mouse.h"\
+	"..\..\..\engines\sky\screen.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\struc.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
@@ -1898,44 +2049,133 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_DEBUG=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.cpp"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1943,6 +2183,7 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
@@ -1952,22 +2193,22 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -1976,11 +2217,16 @@ DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.cpp"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1988,6 +2234,7 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
@@ -1997,22 +2244,22 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
 !ENDIF 
@@ -2020,49 +2267,26 @@ NODEP_CPP_DEBUG=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\debug.h
+SOURCE=..\..\..\engines\sky\debug.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\disk.cpp
+SOURCE=..\..\..\engines\sky\disk.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_DISK_=\
-	"..\..\..\sky\arm\macros.h"\
-	"..\..\..\sky\arm\native.h"\
-	"..\..\..\sky\common\file.h"\
-	"..\..\..\sky\common\scummsys.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\rnc_deco.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\struc.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_DISK_=\
-	"..\..\..\sky\arm\macros.h"\
-	"..\..\..\sky\arm\native.h"\
-	"..\..\..\sky\common\file.h"\
-	"..\..\..\sky\common\scummsys.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\rnc_deco.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\struc.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_DISK_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -2071,24 +2295,24 @@ DEP_CPP_DISK_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_DISK_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sky\arm\macros.h"\
-	"..\..\..\sky\arm\native.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_DISK_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -2100,36 +2324,23 @@ DEP_CPP_DISK_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\struc.h"\
 	
 NODEP_CPP_DISK_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sky\arm\macros.h"\
-	"..\..\..\sky\arm\native.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
-
 DEP_CPP_DISK_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -2138,27 +2349,24 @@ DEP_CPP_DISK_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_DISK_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sky\arm\macros.h"\
-	"..\..\..\sky\arm\native.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
 DEP_CPP_DISK_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -2167,172 +2375,161 @@ DEP_CPP_DISK_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_DISK_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sky\arm\macros.h"\
-	"..\..\..\sky\arm\native.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sky\disk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sky\grid.cpp
-
-!IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
-
-NODEP_CPP_GRID_=\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\grid.h"\
-	"..\..\..\sky\sky\logic.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_GRID_=\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\grid.h"\
-	"..\..\..\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
-DEP_CPP_GRID_=\
+DEP_CPP_DISK_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
-NODEP_CPP_GRID_=\
+NODEP_CPP_DISK_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
 
-DEP_CPP_GRID_=\
+DEP_CPP_DISK_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_GRID_=\
+NODEP_CPP_DISK_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sky\disk.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\sky\grid.cpp
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
+NODEP_CPP_GRID_=\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_GRID_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
+	"..\..\..\engines\sky\compact.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\grid.h"\
+	"..\..\..\engines\sky\logic.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\struc.h"\
 	
 NODEP_CPP_GRID_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_GRID_=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
+NODEP_CPP_GRID_=\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
+
+NODEP_CPP_GRID_=\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
 	
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
+
 NODEP_CPP_GRID_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
+
+NODEP_CPP_GRID_=\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
 	
 
 !ENDIF 
@@ -2340,273 +2537,247 @@ NODEP_CPP_GRID_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\grid.h
+SOURCE=..\..\..\engines\sky\grid.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\hufftext.cpp
+SOURCE=..\..\..\engines\sky\hufftext.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-DEP_CPP_HUFFT=\
-	"..\..\..\sky\text.h"\
-	
-NODEP_CPP_HUFFT=\
-	"..\..\..\sky\common\scummsys.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-DEP_CPP_HUFFT=\
-	"..\..\..\sky\text.h"\
-	
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 NODEP_CPP_HUFFT=\
-	"..\..\..\sky\common\scummsys.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\scumm_globals.h"\
+	"..\..\..\engines\sky\scumm_globals.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_HUFFT=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\sky\text.h"\
+	"..\..\..\engines\sky\text.h"\
 	
 NODEP_CPP_HUFFT=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sky\scumm_globals.h"\
+	"..\..\..\engines\sky\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_HUFFT=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+NODEP_CPP_HUFFT=\
+	"..\..\..\engines\sky\scumm_globals.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
+
 NODEP_CPP_HUFFT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	"..\..\..\sky\scumm_globals.h"\
+	"..\..\..\engines\sky\scumm_globals.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
+NODEP_CPP_HUFFT=\
+	"..\..\..\engines\sky\scumm_globals.h"\
+	"..\..\..\engines\sky\sky\text.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
+NODEP_CPP_HUFFT=\
+	"..\..\..\engines\sky\scumm_globals.h"\
+	"..\..\..\engines\sky\sky\text.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
+!ENDIF 
 
-DEP_CPP_HUFFT=\
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sky\intro.cpp
+
+!IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
+DEP_CPP_INTRO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\sky\text.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
 	
-NODEP_CPP_HUFFT=\
+NODEP_CPP_INTRO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sky\scumm_globals.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\intro.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
-DEP_CPP_HUFFT=\
+DEP_CPP_INTRO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\sky\text.h"\
-	
-NODEP_CPP_HUFFT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	"..\..\..\sky\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sky\intro.cpp
-
-!IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
-
-NODEP_CPP_INTRO=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\system.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\intro.h"\
-	"..\..\..\sky\sky\music\musicbase.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\sound.h"\
-	"..\..\..\sky\sky\struc.h"\
-	"..\..\..\sky\sky\text.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\intro.h"\
+	"..\..\..\engines\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\screen.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\sound.h"\
+	"..\..\..\engines\sky\struc.h"\
+	"..\..\..\engines\sky\text.h"\
+	"..\..\..\sound\mixer.h"\
 	
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
-
 NODEP_CPP_INTRO=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\system.h"\
-	"..\..\..\sky\common\util.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\intro.h"\
-	"..\..\..\sky\sky\music\musicbase.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\sound.h"\
-	"..\..\..\sky\sky\struc.h"\
-	"..\..\..\sky\sky\text.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_INTRO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\intro.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_INTRO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\intro.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
 DEP_CPP_INTRO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\intro.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INTRO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\intro.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_INTRO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\intro.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_INTRO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\intro.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -2615,34 +2786,29 @@ DEP_CPP_INTRO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\intro.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_INTRO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\intro.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
 !ENDIF 
@@ -2650,96 +2816,57 @@ NODEP_CPP_INTRO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\intro.h
+SOURCE=..\..\..\engines\sky\intro.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\logic.cpp
+SOURCE=..\..\..\engines\sky\logic.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_LOGIC=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\sky\autoroute.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\control.h"\
-	"..\..\..\sky\sky\debug.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\grid.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\mouse.h"\
-	"..\..\..\sky\sky\music\musicbase.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\sound.h"\
-	"..\..\..\sky\sky\struc.h"\
-	"..\..\..\sky\sky\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_LOGIC=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\sky\autoroute.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\control.h"\
-	"..\..\..\sky\sky\debug.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\grid.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\mouse.h"\
-	"..\..\..\sky\sky\music\musicbase.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\sound.h"\
-	"..\..\..\sky\sky\struc.h"\
-	"..\..\..\sky\sky\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\autoroute.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\autoroute.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -2751,78 +2878,121 @@ DEP_CPP_LOGIC=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\autoroute.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
+	"..\..\..\engines\sky\autoroute.h"\
+	"..\..\..\engines\sky\compact.h"\
+	"..\..\..\engines\sky\control.h"\
+	"..\..\..\engines\sky\debug.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\grid.h"\
+	"..\..\..\engines\sky\logic.h"\
+	"..\..\..\engines\sky\mouse.h"\
+	"..\..\..\engines\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\screen.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\sound.h"\
+	"..\..\..\engines\sky\struc.h"\
+	"..\..\..\engines\sky\text.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_LOGIC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\autoroute.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\autoroute.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\autoroute.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\autoroute.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -2831,38 +3001,29 @@ DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\autoroute.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\autoroute.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
 !ENDIF 
@@ -2870,146 +3031,181 @@ NODEP_CPP_LOGIC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\logic.h
+SOURCE=..\..\..\engines\sky\logic.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\mouse.cpp
+SOURCE=..\..\..\engines\sky\mouse.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MOUSE=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\system.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\mouse.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\struc.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MOUSE=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\system.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\mouse.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\struc.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sky\compact.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\logic.h"\
+	"..\..\..\engines\sky\mouse.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\struc.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_MOUSE=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_MOUSE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	
+NODEP_CPP_MOUSE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_MOUSE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	
+NODEP_CPP_MOUSE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3018,31 +3214,30 @@ DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
 !ENDIF 
@@ -3050,29 +3245,58 @@ NODEP_CPP_MOUSE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\mouse.h
+SOURCE=..\..\..\engines\sky\mouse.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\rnc_deco.cpp
+SOURCE=..\..\..\engines\sky\rnc_deco.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RNC_D=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
 NODEP_CPP_RNC_D=\
-	"..\..\..\sky\common\scummsys.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\sky\rnc_deco.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\rnc_deco.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
+DEP_CPP_RNC_D=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	
 NODEP_CPP_RNC_D=\
-	"..\..\..\sky\common\scummsys.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\sky\rnc_deco.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_RNC_D=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3081,16 +3305,16 @@ DEP_CPP_RNC_D=\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\sky\rnc_deco.h"\
 	
 NODEP_CPP_RNC_D=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\rnc_deco.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
 DEP_CPP_RNC_D=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3099,24 +3323,15 @@ DEP_CPP_RNC_D=\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RNC_D=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\rnc_deco.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_RNC_D=\
@@ -3126,13 +3341,13 @@ DEP_CPP_RNC_D=\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\sky\rnc_deco.h"\
 	
 NODEP_CPP_RNC_D=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\rnc_deco.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3144,13 +3359,13 @@ DEP_CPP_RNC_D=\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\sky\rnc_deco.h"\
 	
 NODEP_CPP_RNC_D=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\rnc_deco.h"\
 	
 
 !ENDIF 
@@ -3158,146 +3373,171 @@ NODEP_CPP_RNC_D=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\rnc_deco.h
+SOURCE=..\..\..\engines\sky\rnc_deco.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\screen.cpp
+SOURCE=..\..\..\engines\sky\screen.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCREE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
 NODEP_CPP_SCREE=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\system.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\struc.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
+
+DEP_CPP_SCREE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sky\compact.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\logic.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\screen.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\struc.h"\
 	
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
-
 NODEP_CPP_SCREE=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\system.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\struc.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3306,31 +3546,28 @@ DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
 	
 NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
 !ENDIF 
@@ -3338,92 +3575,34 @@ NODEP_CPP_SCREE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\screen.h
+SOURCE=..\..\..\engines\sky\screen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\sky.cpp
+SOURCE=..\..\..\engines\sky\sky.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SKY_C=\
-	"..\..\..\sky\backends\fs\fs.h"\
-	"..\..\..\sky\base\options.h"\
-	"..\..\..\sky\base\plugins.h"\
-	"..\..\..\sky\common\config-manager.h"\
-	"..\..\..\sky\common\file.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\system.h"\
-	"..\..\..\sky\common\timer.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\control.h"\
-	"..\..\..\sky\sky\debug.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\grid.h"\
-	"..\..\..\sky\sky\intro.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\mouse.h"\
-	"..\..\..\sky\sky\music\adlibmusic.h"\
-	"..\..\..\sky\sky\music\gmmusic.h"\
-	"..\..\..\sky\sky\music\mt32music.h"\
-	"..\..\..\sky\sky\music\musicbase.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\sound.h"\
-	"..\..\..\sky\sky\text.h"\
-	"..\..\..\sky\sound\mididrv.h"\
-	"..\..\..\sky\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SKY_C=\
-	"..\..\..\sky\backends\fs\fs.h"\
-	"..\..\..\sky\base\options.h"\
-	"..\..\..\sky\base\plugins.h"\
-	"..\..\..\sky\common\config-manager.h"\
-	"..\..\..\sky\common\file.h"\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\common\system.h"\
-	"..\..\..\sky\common\timer.h"\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\control.h"\
-	"..\..\..\sky\sky\debug.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\grid.h"\
-	"..\..\..\sky\sky\intro.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\mouse.h"\
-	"..\..\..\sky\sky\music\adlibmusic.h"\
-	"..\..\..\sky\sky\music\gmmusic.h"\
-	"..\..\..\sky\sky\music\mt32music.h"\
-	"..\..\..\sky\sky\music\musicbase.h"\
-	"..\..\..\sky\sky\screen.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\sound.h"\
-	"..\..\..\sky\sky\text.h"\
-	"..\..\..\sky\sound\mididrv.h"\
-	"..\..\..\sky\sound\mixer.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_SKY_C=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -3434,27 +3613,6 @@ DEP_CPP_SKY_C=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\intro.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\adlibmusic.h"\
-	"..\..\..\sky\music\gmmusic.h"\
-	"..\..\..\sky\music\mt32music.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
@@ -3464,24 +3622,43 @@ NODEP_CPP_SKY_C=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\intro.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\sky\music\mt32music.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_SKY_C=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -3492,47 +3669,141 @@ DEP_CPP_SKY_C=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\intro.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\adlibmusic.h"\
-	"..\..\..\sky\music\gmmusic.h"\
-	"..\..\..\sky\music\mt32music.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
+	"..\..\..\engines\sky\compact.h"\
+	"..\..\..\engines\sky\control.h"\
+	"..\..\..\engines\sky\debug.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\grid.h"\
+	"..\..\..\engines\sky\intro.h"\
+	"..\..\..\engines\sky\logic.h"\
+	"..\..\..\engines\sky\mouse.h"\
+	"..\..\..\engines\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\music\mt32music.h"\
+	"..\..\..\engines\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\screen.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\sound.h"\
+	"..\..\..\engines\sky\struc.h"\
+	"..\..\..\engines\sky\text.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SKY_C=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SKY_C=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.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"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SKY_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\intro.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\sky\music\mt32music.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SKY_C=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.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"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_SKY_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\intro.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\sky\music\mt32music.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SKY_C=\
@@ -3540,15 +3811,13 @@ DEP_CPP_SKY_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -3559,27 +3828,6 @@ DEP_CPP_SKY_C=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\intro.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\adlibmusic.h"\
-	"..\..\..\sky\music\gmmusic.h"\
-	"..\..\..\sky\music\mt32music.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
@@ -3589,6 +3837,23 @@ NODEP_CPP_SKY_C=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\intro.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\sky\music\mt32music.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3598,15 +3863,13 @@ DEP_CPP_SKY_C=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -3617,27 +3880,6 @@ DEP_CPP_SKY_C=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\control.h"\
-	"..\..\..\sky\debug.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\grid.h"\
-	"..\..\..\sky\intro.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\mouse.h"\
-	"..\..\..\sky\music\adlibmusic.h"\
-	"..\..\..\sky\music\gmmusic.h"\
-	"..\..\..\sky\music\mt32music.h"\
-	"..\..\..\sky\music\musicbase.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\screen.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
@@ -3647,6 +3889,23 @@ NODEP_CPP_SKY_C=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\control.h"\
+	"..\..\..\engines\sky\sky\debug.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\grid.h"\
+	"..\..\..\engines\sky\sky\intro.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\mouse.h"\
+	"..\..\..\engines\sky\sky\music\adlibmusic.h"\
+	"..\..\..\engines\sky\sky\music\gmmusic.h"\
+	"..\..\..\engines\sky\sky\music\mt32music.h"\
+	"..\..\..\engines\sky\sky\music\musicbase.h"\
+	"..\..\..\engines\sky\sky\screen.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
 !ENDIF 
@@ -3654,74 +3913,53 @@ NODEP_CPP_SKY_C=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\sky.h
+SOURCE=..\..\..\engines\sky\sky.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\skydefs.h
+SOURCE=..\..\..\engines\sky\skydefs.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\sound.cpp
+SOURCE=..\..\..\engines\sky\sound.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\sound.h"\
-	"..\..\..\sky\sky\struc.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\sky\common\stdafx.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\sound.h"\
-	"..\..\..\sky\sky\struc.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -3732,59 +3970,88 @@ DEP_CPP_SOUND=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\logic.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\sound.h"\
+	"..\..\..\engines\sky\struc.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3793,28 +4060,21 @@ DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\sound.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\sound.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
 	
 
 !ENDIF 
@@ -3822,73 +4082,54 @@ NODEP_CPP_SOUND=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\sound.h
+SOURCE=..\..\..\engines\sky\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\struc.h
+SOURCE=..\..\..\engines\sky\struc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\text.cpp
+SOURCE=..\..\..\engines\sky\text.cpp
 
 !IF  "$(CFG)" == "sky - Win32 (WCE emulator) Release"
 
-NODEP_CPP_TEXT_=\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\struc.h"\
-	"..\..\..\sky\sky\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_TEXT_=\
-	"..\..\..\sky\sky\compact.h"\
-	"..\..\..\sky\sky\disk.h"\
-	"..\..\..\sky\sky\logic.h"\
-	"..\..\..\sky\sky\sky.h"\
-	"..\..\..\sky\sky\skydefs.h"\
-	"..\..\..\sky\sky\struc.h"\
-	"..\..\..\sky\sky\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
+
 DEP_CPP_TEXT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
 
 DEP_CPP_TEXT_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -3898,58 +4139,91 @@ DEP_CPP_TEXT_=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sky\compact.h"\
+	"..\..\..\engines\sky\disk.h"\
+	"..\..\..\engines\sky\logic.h"\
+	"..\..\..\engines\sky\rnc_deco.h"\
+	"..\..\..\engines\sky\sky.h"\
+	"..\..\..\engines\sky\skydefs.h"\
+	"..\..\..\engines\sky\struc.h"\
+	"..\..\..\engines\sky\text.h"\
 	
 NODEP_CPP_TEXT_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sky - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_TEXT_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_TEXT_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE MIPS) Release"
 
+DEP_CPP_TEXT_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_TEXT_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Debug"
 
 DEP_CPP_TEXT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sky - Win32 (WCE SH3) Release"
@@ -3958,27 +4232,22 @@ DEP_CPP_TEXT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sky\compact.h"\
-	"..\..\..\sky\disk.h"\
-	"..\..\..\sky\logic.h"\
-	"..\..\..\sky\rnc_deco.h"\
-	"..\..\..\sky\sky.h"\
-	"..\..\..\sky\skydefs.h"\
-	"..\..\..\sky\struc.h"\
-	"..\..\..\sky\text.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sky\sky\compact.h"\
+	"..\..\..\engines\sky\sky\disk.h"\
+	"..\..\..\engines\sky\sky\logic.h"\
+	"..\..\..\engines\sky\sky\sky.h"\
+	"..\..\..\engines\sky\sky\skydefs.h"\
+	"..\..\..\engines\sky\sky\struc.h"\
+	"..\..\..\engines\sky\sky\text.h"\
 	
 
 !ENDIF 
@@ -3986,12 +4255,8 @@ NODEP_CPP_TEXT_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sky\text.h
+SOURCE=..\..\..\engines\sky\text.h
 # End Source File
 # End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
 # End Target
 # End Project
diff --git a/dists/msevc4/sword1/sword1.vcp b/dists/msevc4/sword1/sword1.vcp
index 9336062fd0..dc08688629 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/" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
 
@@ -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" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /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" /I "../../../engines" /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_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -290,8 +290,8 @@ BSC32=bscmake.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 CPP=shcl.exe
-# 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" /YX /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxs /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" /D "USE_ZLIB" /YX /M$(CECrtMT) /c
+# 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" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -318,49 +318,27 @@ BSC32=bscmake.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\sword1\animation.cpp
+SOURCE=..\..\..\engines\sword1\animation.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ANIMA=\
-	"..\..\..\sword1\common\config-manager.h"\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\str.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\sound\vorbis.h"\
-	"..\..\..\sword1\sword1\animation.h"\
-	"..\..\..\sword1\sword1\credits.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ANIMA=\
-	"..\..\..\sword1\common\config-manager.h"\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\str.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\sound\vorbis.h"\
-	"..\..\..\sword1\sword1\animation.h"\
-	"..\..\..\sword1\sword1\credits.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -370,38 +348,33 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -411,48 +384,99 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\animation.h"\
+	"..\..\..\engines\sword1\credits.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\screen.h"\
+	"..\..\..\engines\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
 	"..\..\..\graphics\animation.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_ANIMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_ANIMA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_ANIMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_ANIMA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -462,23 +486,16 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -487,13 +504,11 @@ DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -503,23 +518,16 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
 	
 
 !ENDIF 
@@ -527,66 +535,30 @@ NODEP_CPP_ANIMA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\animation.h
+SOURCE=..\..\..\engines\sword1\animation.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\collision.h
+SOURCE=..\..\..\engines\sword1\collision.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\control.cpp
+SOURCE=..\..\..\engines\sword1\control.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CONTR=\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\savefile.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\gui\message.h"\
-	"..\..\..\sword1\sword1\control.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\mouse.h"\
-	"..\..\..\sword1\sword1\music.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CONTR=\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\savefile.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\gui\message.h"\
-	"..\..\..\sword1\sword1\control.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\mouse.h"\
-	"..\..\..\sword1\sword1\music.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -594,7 +566,6 @@ DEP_CPP_CONTR=\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
@@ -606,37 +577,33 @@ DEP_CPP_CONTR=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\control.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\control.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -644,12 +611,23 @@ DEP_CPP_CONTR=\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\control.h"\
+	"..\..\..\engines\sword1\logic.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\mouse.h"\
+	"..\..\..\engines\sword1\music.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\swordres.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
@@ -659,43 +637,103 @@ DEP_CPP_CONTR=\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\control.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONTR=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_CONTR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONTR=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\control.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_CONTR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.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"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONTR=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\control.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -703,7 +741,6 @@ DEP_CPP_CONTR=\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
@@ -715,27 +752,22 @@ DEP_CPP_CONTR=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\control.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\control.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -744,8 +776,6 @@ DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -753,7 +783,6 @@ DEP_CPP_CONTR=\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
@@ -765,27 +794,22 @@ DEP_CPP_CONTR=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\control.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\control.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
 !ENDIF 
@@ -793,55 +817,32 @@ NODEP_CPP_CONTR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\control.h
+SOURCE=..\..\..\engines\sword1\control.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\credits.cpp
+SOURCE=..\..\..\engines\sword1\credits.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CREDI=\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sound\audiostream.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\sword1\credits.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CREDI=\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sound\audiostream.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\sword1\credits.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_CREDI=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
@@ -849,76 +850,62 @@ DEP_CPP_CREDI=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_CREDI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_CREDI=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\credits.h"\
+	"..\..\..\engines\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CREDI=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
-
 DEP_CPP_CREDI=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
@@ -926,33 +913,29 @@ DEP_CPP_CREDI=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_CREDI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_CREDI=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
@@ -960,109 +943,195 @@ DEP_CPP_CREDI=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_CREDI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
 	
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CREDI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_CREDI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
+
+DEP_CPP_CREDI=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_CREDI=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	
+
+!ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\credits.h
+SOURCE=..\..\..\engines\sword1\credits.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\debug.cpp
+SOURCE=..\..\..\engines\sword1\debug.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
 NODEP_CPP_DEBUG=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\debug.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\debug.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
+DEP_CPP_DEBUG=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\debug.h"\
+	
 NODEP_CPP_DEBUG=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\debug.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\debug.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\debug.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\debug.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\debug.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\debug.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\debug.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -1071,17 +1140,18 @@ DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\debug.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\debug.h"\
 	
 
 !ENDIF 
@@ -1089,100 +1159,125 @@ NODEP_CPP_DEBUG=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\debug.h
+SOURCE=..\..\..\engines\sword1\debug.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\eventman.cpp
+SOURCE=..\..\..\engines\sword1\eventman.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_EVENT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
 NODEP_CPP_EVENT=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\eventman.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\eventman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
+DEP_CPP_EVENT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\eventman.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	
 NODEP_CPP_EVENT=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\eventman.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\eventman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_EVENT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\eventman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\eventman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_EVENT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\eventman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\eventman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_EVENT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\eventman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -1191,19 +1286,19 @@ DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\eventman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_EVENT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\eventman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
 	
 
 !ENDIF 
@@ -1211,119 +1306,71 @@ NODEP_CPP_EVENT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\eventman.h
+SOURCE=..\..\..\engines\sword1\eventman.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\logic.cpp
+SOURCE=..\..\..\engines\sword1\logic.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_LOGIC=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\gui\message.h"\
-	"..\..\..\sword1\sword1\animation.h"\
-	"..\..\..\sword1\sword1\credits.h"\
-	"..\..\..\sword1\sword1\debug.h"\
-	"..\..\..\sword1\sword1\eventman.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\mouse.h"\
-	"..\..\..\sword1\sword1\music.h"\
-	"..\..\..\sword1\sword1\router.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	"..\..\..\sword1\sword1\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_LOGIC=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\gui\message.h"\
-	"..\..\..\sword1\sword1\animation.h"\
-	"..\..\..\sword1\sword1\credits.h"\
-	"..\..\..\sword1\sword1\debug.h"\
-	"..\..\..\sword1\sword1\eventman.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\mouse.h"\
-	"..\..\..\sword1\sword1\music.h"\
-	"..\..\..\sword1\sword1\router.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	"..\..\..\sword1\sword1\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\debug.h"\
-	"..\..\..\sword1\eventman.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\router.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\debug.h"\
+	"..\..\..\engines\sword1\sword1\eventman.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\router.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -1334,6 +1381,25 @@ DEP_CPP_LOGIC=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\animation.h"\
+	"..\..\..\engines\sword1\credits.h"\
+	"..\..\..\engines\sword1\debug.h"\
+	"..\..\..\engines\sword1\eventman.h"\
+	"..\..\..\engines\sword1\logic.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\menu.h"\
+	"..\..\..\engines\sword1\mouse.h"\
+	"..\..\..\engines\sword1\music.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\router.h"\
+	"..\..\..\engines\sword1\screen.h"\
+	"..\..\..\engines\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\swordres.h"\
+	"..\..\..\engines\sword1\text.h"\
 	"..\..\..\graphics\animation.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
@@ -1344,96 +1410,134 @@ DEP_CPP_LOGIC=\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\debug.h"\
-	"..\..\..\sword1\eventman.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\router.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	"..\..\..\sword1\text.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_LOGIC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\debug.h"\
+	"..\..\..\engines\sword1\sword1\eventman.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\router.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\debug.h"\
+	"..\..\..\engines\sword1\sword1\eventman.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\router.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\debug.h"\
-	"..\..\..\sword1\eventman.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\router.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\debug.h"\
+	"..\..\..\engines\sword1\sword1\eventman.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\router.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -1442,53 +1546,39 @@ DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\credits.h"\
-	"..\..\..\sword1\debug.h"\
-	"..\..\..\sword1\eventman.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\router.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_LOGIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\credits.h"\
+	"..\..\..\engines\sword1\sword1\debug.h"\
+	"..\..\..\engines\sword1\sword1\eventman.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\router.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
 	
 
 !ENDIF 
@@ -1496,92 +1586,119 @@ NODEP_CPP_LOGIC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\logic.h
+SOURCE=..\..\..\engines\sword1\logic.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\memman.cpp
+SOURCE=..\..\..\engines\sword1\memman.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MEMMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
 NODEP_CPP_MEMMA=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\memman.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\memman.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
+DEP_CPP_MEMMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	
 NODEP_CPP_MEMMA=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\memman.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_MEMMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
 	
 NODEP_CPP_MEMMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\memman.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_MEMMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MEMMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\memman.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MEMMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
 	
 NODEP_CPP_MEMMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\memman.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -1590,17 +1707,18 @@ DEP_CPP_MEMMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
 	
 NODEP_CPP_MEMMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\memman.h"\
 	
 
 !ENDIF 
@@ -1608,121 +1726,136 @@ NODEP_CPP_MEMMA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\memman.h
+SOURCE=..\..\..\engines\sword1\memman.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\menu.cpp
+SOURCE=..\..\..\engines\sword1\menu.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MENU_=\
-	"..\..\..\sword1\common\scummsys.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\mouse.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MENU_=\
-	"..\..\..\sword1\common\scummsys.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\mouse.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\logic.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\menu.h"\
+	"..\..\..\engines\sword1\mouse.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\screen.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MENU_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_MENU_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_MENU_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_MENU_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_MENU_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MENU_=\
@@ -1730,33 +1863,24 @@ DEP_CPP_MENU_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -1766,33 +1890,24 @@ DEP_CPP_MENU_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
 	
 
 !ENDIF 
@@ -1800,43 +1915,95 @@ NODEP_CPP_MENU_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\menu.h
+SOURCE=..\..\..\engines\sword1\menu.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\mouse.cpp
+SOURCE=..\..\..\engines\sword1\mouse.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MOUSE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	
 NODEP_CPP_MOUSE=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\mouse.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
+
+DEP_CPP_MOUSE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\logic.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\menu.h"\
+	"..\..\..\engines\sword1\mouse.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\screen.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\swordres.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\mixer.h"\
 	
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
-
 NODEP_CPP_MOUSE=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\mouse.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1844,36 +2011,33 @@ DEP_CPP_MOUSE=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1881,44 +2045,32 @@ DEP_CPP_MOUSE=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MOUSE=\
@@ -1927,33 +2079,30 @@ DEP_CPP_MOUSE=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -1964,33 +2113,30 @@ DEP_CPP_MOUSE=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
 NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
 !ENDIF 
@@ -1998,78 +2144,56 @@ NODEP_CPP_MOUSE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\mouse.h
+SOURCE=..\..\..\engines\sword1\mouse.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\music.cpp
+SOURCE=..\..\..\engines\sword1\music.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MUSIC=\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\sound\mp3.h"\
-	"..\..\..\sword1\sound\vorbis.h"\
-	"..\..\..\sword1\sound\wave.h"\
-	"..\..\..\sword1\sword1\music.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MUSIC=\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sound\mixer.h"\
-	"..\..\..\sword1\sound\mp3.h"\
-	"..\..\..\sword1\sound\vorbis.h"\
-	"..\..\..\sword1\sound\wave.h"\
-	"..\..\..\sword1\sword1\music.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword1\music.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -2079,68 +2203,113 @@ DEP_CPP_MUSIC=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\music.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\rate.h"\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword1\music.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MUSIC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_MUSIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_MUSIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_MUSIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_MUSIC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword1\music.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -2149,32 +2318,28 @@ DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword1\music.h"\
 	
 NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
 	
 
 !ENDIF 
@@ -2182,48 +2347,57 @@ NODEP_CPP_MUSIC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\music.h
+SOURCE=..\..\..\engines\sword1\music.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\object.h
+SOURCE=..\..\..\engines\sword1\object.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\objectman.cpp
+SOURCE=..\..\..\engines\sword1\objectman.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_OBJEC=\
-	"..\..\..\sword1\common\scummsys.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_OBJEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
 NODEP_CPP_OBJEC=\
-	"..\..\..\sword1\common\scummsys.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_OBJEC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -2232,169 +2406,229 @@ DEP_CPP_OBJEC=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\swordres.h"\
 	
 NODEP_CPP_OBJEC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_OBJEC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
+DEP_CPP_OBJEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_OBJEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
+DEP_CPP_OBJEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_OBJEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
 
 DEP_CPP_OBJEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_OBJEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword1\objectman.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword1\resman.cpp
+
+!IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_OBJEC=\
+NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\memman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
-DEP_CPP_OBJEC=\
+DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\swordres.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_OBJEC=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_RESMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword1\objectman.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword1\resman.cpp
-
-!IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RESMA=\
-	"..\..\..\sword1\base\engine.h"\
-	"..\..\..\sword1\common\config-manager.h"\
-	"..\..\..\sword1\common\scummsys.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\str.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\gui\message.h"\
-	"..\..\..\sword1\gui\newgui.h"\
-	"..\..\..\sword1\sword1\memman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RESMA=\
-	"..\..\..\sword1\base\engine.h"\
-	"..\..\..\sword1\common\config-manager.h"\
-	"..\..\..\sword1\common\scummsys.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\str.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\gui\message.h"\
-	"..\..\..\sword1\gui\newgui.h"\
-	"..\..\..\sword1\sword1\memman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2402,10 +2636,14 @@ DEP_CPP_RESMA=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
@@ -2413,6 +2651,7 @@ DEP_CPP_RESMA=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
@@ -2421,20 +2660,21 @@ DEP_CPP_RESMA=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\memman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2442,10 +2682,14 @@ DEP_CPP_RESMA=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
@@ -2453,6 +2697,7 @@ DEP_CPP_RESMA=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
@@ -2461,28 +2706,20 @@ DEP_CPP_RESMA=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\memman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_RESMA=\
@@ -2491,10 +2728,14 @@ DEP_CPP_RESMA=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
@@ -2502,6 +2743,7 @@ DEP_CPP_RESMA=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
@@ -2510,17 +2752,18 @@ DEP_CPP_RESMA=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\memman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -2531,10 +2774,14 @@ DEP_CPP_RESMA=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
@@ -2542,6 +2789,7 @@ DEP_CPP_RESMA=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
@@ -2550,17 +2798,18 @@ DEP_CPP_RESMA=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\memman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
 !ENDIF 
@@ -2568,71 +2817,51 @@ NODEP_CPP_RESMA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\resman.h
+SOURCE=..\..\..\engines\sword1\resman.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\router.cpp
+SOURCE=..\..\..\engines\sword1\router.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ROUTE=\
-	"..\..\..\sword1\common\scummsys.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\router.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ROUTE=\
-	"..\..\..\sword1\common\scummsys.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\router.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_ROUTE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\router.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\router.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_ROUTE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
@@ -2643,30 +2872,70 @@ DEP_CPP_ROUTE=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\router.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\router.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\swordres.h"\
 	
 NODEP_CPP_ROUTE=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_ROUTE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ROUTE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\router.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_ROUTE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ROUTE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\router.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ROUTE=\
@@ -2675,25 +2944,21 @@ DEP_CPP_ROUTE=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\router.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\router.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -2704,25 +2969,21 @@ DEP_CPP_ROUTE=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\router.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\router.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
 !ENDIF 
@@ -2730,195 +2991,189 @@ NODEP_CPP_ROUTE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\router.h
+SOURCE=..\..\..\engines\sword1\router.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\screen.cpp
+SOURCE=..\..\..\engines\sword1\screen.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCREE=\
-	"..\..\..\sword1\arm\macros.h"\
-	"..\..\..\sword1\arm\native.h"\
-	"..\..\..\sword1\common\scummsys.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\animation.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCREE=\
-	"..\..\..\sword1\arm\macros.h"\
-	"..\..\..\sword1\arm\native.h"\
-	"..\..\..\sword1\common\scummsys.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\animation.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\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"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sword1\arm\macros.h"\
-	"..\..\..\sword1\arm\native.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\animation.h"\
+	"..\..\..\engines\sword1\logic.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\menu.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\screen.h"\
+	"..\..\..\engines\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\text.h"\
 	"..\..\..\graphics\animation.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\text.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCREE=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sword1\arm\macros.h"\
-	"..\..\..\sword1\arm\native.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SCREE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_SCREE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SCREE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_SCREE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\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"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sword1\arm\macros.h"\
-	"..\..\..\sword1\arm\native.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -2927,43 +3182,30 @@ DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword1\animation.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\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"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sword1\arm\macros.h"\
-	"..\..\..\sword1\arm\native.h"\
+	"..\..\..\engines\sword1\sword1\animation.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
 	
 
 !ENDIF 
@@ -2971,85 +3213,56 @@ NODEP_CPP_SCREE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\screen.h
+SOURCE=..\..\..\engines\sword1\screen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\sound.cpp
+SOURCE=..\..\..\engines\sword1\sound.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sound\mp3.h"\
-	"..\..\..\sword1\sound\vorbis.h"\
-	"..\..\..\sword1\sound\wave.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sound\mp3.h"\
-	"..\..\..\sword1\sound\vorbis.h"\
-	"..\..\..\sword1\sound\wave.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
@@ -3059,70 +3272,104 @@ DEP_CPP_SOUND=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\logic.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -3131,35 +3378,25 @@ DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
 	
 
 !ENDIF 
@@ -3167,56 +3404,51 @@ NODEP_CPP_SOUND=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\sound.h
+SOURCE=..\..\..\engines\sword1\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\staticres.cpp
+SOURCE=..\..\..\engines\sword1\staticres.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_STATI=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\scumm_globals.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\music.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_STATI=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
 NODEP_CPP_STATI=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\scumm_globals.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\music.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\scumm_globals.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_STATI=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
@@ -3224,234 +3456,264 @@ DEP_CPP_STATI=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\logic.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\menu.h"\
+	"..\..\..\engines\sword1\music.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\screen.h"\
+	"..\..\..\engines\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\swordres.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_STATI=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sword1\scumm_globals.h"\
+	"..\..\..\engines\sword1\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_STATI=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STATI=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	"..\..\..\sword1\scumm_globals.h"\
+	"..\..\..\engines\sword1\scumm_globals.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
+DEP_CPP_STATI=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_STATI=\
+	"..\..\..\engines\sword1\scumm_globals.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
+DEP_CPP_STATI=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_STATI=\
+	"..\..\..\engines\sword1\scumm_globals.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
 
 DEP_CPP_STATI=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_STATI=\
+	"..\..\..\engines\sword1\scumm_globals.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword1\sword1.cpp
+
+!IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SWORD=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_STATI=\
+NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sword1\scumm_globals.h"\
+	"..\..\..\engines\sword1\sword1\control.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
-DEP_CPP_STATI=\
+DEP_CPP_SWORD=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword1\control.h"\
+	"..\..\..\engines\sword1\logic.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\menu.h"\
+	"..\..\..\engines\sword1\mouse.h"\
+	"..\..\..\engines\sword1\music.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\screen.h"\
+	"..\..\..\engines\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\swordres.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\message.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
-NODEP_CPP_STATI=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SWORD=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\sword1\scumm_globals.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword1\sword1.cpp
-
-!IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SWORD=\
-	"..\..\..\sword1\backends\fs\fs.h"\
-	"..\..\..\sword1\base\plugins.h"\
-	"..\..\..\sword1\common\config-manager.h"\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\timer.h"\
-	"..\..\..\sword1\gui\message.h"\
-	"..\..\..\sword1\gui\newgui.h"\
-	"..\..\..\sword1\sword1\control.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\mouse.h"\
-	"..\..\..\sword1\sword1\music.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SWORD=\
-	"..\..\..\sword1\backends\fs\fs.h"\
-	"..\..\..\sword1\base\plugins.h"\
-	"..\..\..\sword1\common\config-manager.h"\
-	"..\..\..\sword1\common\file.h"\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\system.h"\
-	"..\..\..\sword1\common\timer.h"\
-	"..\..\..\sword1\gui\message.h"\
-	"..\..\..\sword1\gui\newgui.h"\
-	"..\..\..\sword1\sword1\control.h"\
-	"..\..\..\sword1\sword1\logic.h"\
-	"..\..\..\sword1\sword1\menu.h"\
-	"..\..\..\sword1\sword1\mouse.h"\
-	"..\..\..\sword1\sword1\music.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\screen.h"\
-	"..\..\..\sword1\sword1\sound.h"\
-	"..\..\..\sword1\sword1\sword1.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SWORD=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -3470,24 +3732,8 @@ DEP_CPP_SWORD=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\control.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
@@ -3495,23 +3741,35 @@ NODEP_CPP_SWORD=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\control.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SWORD=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -3530,25 +3788,8 @@ DEP_CPP_SWORD=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\control.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
@@ -3556,16 +3797,19 @@ NODEP_CPP_SWORD=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\control.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SWORD=\
@@ -3573,14 +3817,15 @@ DEP_CPP_SWORD=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -3599,24 +3844,8 @@ DEP_CPP_SWORD=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\control.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
@@ -3624,6 +3853,17 @@ NODEP_CPP_SWORD=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\control.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -3633,14 +3873,15 @@ DEP_CPP_SWORD=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -3659,24 +3900,8 @@ DEP_CPP_SWORD=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
 	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sword1\control.h"\
-	"..\..\..\sword1\logic.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\menu.h"\
-	"..\..\..\sword1\mouse.h"\
-	"..\..\..\sword1\music.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\screen.h"\
-	"..\..\..\sword1\sound.h"\
-	"..\..\..\sword1\sword1.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
@@ -3684,6 +3909,17 @@ NODEP_CPP_SWORD=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\control.h"\
+	"..\..\..\engines\sword1\sword1\logic.h"\
+	"..\..\..\engines\sword1\sword1\menu.h"\
+	"..\..\..\engines\sword1\sword1\mouse.h"\
+	"..\..\..\engines\sword1\sword1\music.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\screen.h"\
+	"..\..\..\engines\sword1\sword1\sound.h"\
+	"..\..\..\engines\sword1\sword1\sword1.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
 	
 
 !ENDIF 
@@ -3691,77 +3927,59 @@ NODEP_CPP_SWORD=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\sword1.h
+SOURCE=..\..\..\engines\sword1\sword1.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\sworddefs.h
+SOURCE=..\..\..\engines\sword1\sworddefs.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\swordres.h
+SOURCE=..\..\..\engines\sword1\swordres.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\text.cpp
+SOURCE=..\..\..\engines\sword1\text.cpp
 
 !IF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_TEXT_=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	"..\..\..\sword1\sword1\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_TEXT_=\
-	"..\..\..\sword1\common\stdafx.h"\
-	"..\..\..\sword1\common\util.h"\
-	"..\..\..\sword1\sword1\objectman.h"\
-	"..\..\..\sword1\sword1\resman.h"\
-	"..\..\..\sword1\sword1\sworddefs.h"\
-	"..\..\..\sword1\sword1\swordres.h"\
-	"..\..\..\sword1\sword1\text.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_TEXT_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
 
 DEP_CPP_TEXT_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
@@ -3772,30 +3990,70 @@ DEP_CPP_TEXT_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	"..\..\..\sword1\text.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword1\memman.h"\
+	"..\..\..\engines\sword1\object.h"\
+	"..\..\..\engines\sword1\objectman.h"\
+	"..\..\..\engines\sword1\resman.h"\
+	"..\..\..\engines\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\swordres.h"\
+	"..\..\..\engines\sword1\text.h"\
 	
 NODEP_CPP_TEXT_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_TEXT_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_TEXT_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_TEXT_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_TEXT_=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_TEXT_=\
@@ -3804,25 +4062,21 @@ DEP_CPP_TEXT_=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword1 - Win32 (WCE SH3) Release"
@@ -3833,25 +4087,21 @@ DEP_CPP_TEXT_=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword1\memman.h"\
-	"..\..\..\sword1\object.h"\
-	"..\..\..\sword1\objectman.h"\
-	"..\..\..\sword1\resman.h"\
-	"..\..\..\sword1\sworddefs.h"\
-	"..\..\..\sword1\swordres.h"\
-	"..\..\..\sword1\text.h"\
 	
 NODEP_CPP_TEXT_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword1\sword1\objectman.h"\
+	"..\..\..\engines\sword1\sword1\resman.h"\
+	"..\..\..\engines\sword1\sword1\sworddefs.h"\
+	"..\..\..\engines\sword1\sword1\swordres.h"\
+	"..\..\..\engines\sword1\sword1\text.h"\
 	
 
 !ENDIF 
@@ -3859,12 +4109,8 @@ NODEP_CPP_TEXT_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword1\text.h
+SOURCE=..\..\..\engines\sword1\text.h
 # End Source File
 # End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
 # End Target
 # End Project
diff --git a/dists/msevc4/sword2/sword2.vcp b/dists/msevc4/sword2/sword2.vcp
index 5774a1e6ba..fff8c6e5b3 100644
--- a/dists/msevc4/sword2/sword2.vcp
+++ b/dists/msevc4/sword2/sword2.vcp
@@ -55,15 +55,15 @@ CFG=sword2 - 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)" == "sword2 - 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)" == "sword2 - 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/" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /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 "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "sword2 - 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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /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_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
@@ -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" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /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" /I "../../../engines" /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_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -290,8 +290,8 @@ BSC32=bscmake.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 CPP=shcl.exe
-# 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" /YX /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxs /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" /D "USE_ZLIB" /YX /M$(CECrtMT) /c
+# 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" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -316,227 +316,113 @@ BSC32=bscmake.exe
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "driver"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\_mouse.cpp
+SOURCE=..\..\..\engines\sword2\animation.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP__MOUS=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP__MOUS=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP__MOUS=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP__MOUS=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP__MOUS=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP__MOUS=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP__MOUS=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP__MOUS=\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP__MOUS=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP__MOUS=\
-	"..\..\..\common\config.h"\
+	"..\..\..\engines\sword2\animation.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\graphics\animation.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\driver\animation.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ANIMA=\
-	"..\..\..\sword2\driver\common\config-manager.h"\
-	"..\..\..\sword2\driver\common\file.h"\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sound\mp3.h"\
-	"..\..\..\sword2\driver\sound\vorbis.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\driver\animation.h"\
-	"..\..\..\sword2\driver\sword2\maketext.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sound.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ANIMA=\
-	"..\..\..\sword2\driver\common\config-manager.h"\
-	"..\..\..\sword2\driver\common\file.h"\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sound\mp3.h"\
-	"..\..\..\sword2\driver\sound\vorbis.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\driver\animation.h"\
-	"..\..\..\sword2\driver\sword2\maketext.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sound.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -546,43 +432,35 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -592,53 +470,35 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -648,29 +508,22 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -679,12 +532,11 @@ DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -694,29 +546,22 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -724,165 +569,217 @@ NODEP_CPP_ANIMA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\animation.h
+SOURCE=..\..\..\engines\sword2\animation.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\d_draw.cpp
+SOURCE=..\..\..\engines\sword2\anims.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_D_DRA=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_D_DRA=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_D_DRA=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ANIMS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_DRA=\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ANIMS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_D_DRA=\
+DEP_CPP_ANIMS=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_D_DRA=\
-	"..\..\..\common\config.h"\
+	"..\..\..\engines\sword2\animation.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\graphics\animation.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_ANIMS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+DEP_CPP_ANIMS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ANIMS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_D_DRA=\
+DEP_CPP_ANIMS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_DRA=\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ANIMS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_D_DRA=\
+DEP_CPP_ANIMS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_DRA=\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ANIMS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_ANIMS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ANIMS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -890,415 +787,445 @@ NODEP_CPP_D_DRA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\d_sound.cpp
+SOURCE=..\..\..\engines\sword2\console.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_D_SOU=\
-	"..\..\..\sword2\driver\common\file.h"\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sound\flac.h"\
-	"..\..\..\sword2\driver\sound\mp3.h"\
-	"..\..\..\sword2\driver\sound\rate.h"\
-	"..\..\..\sword2\driver\sound\vorbis.h"\
-	"..\..\..\sword2\driver\sound\wave.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sound.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_D_SOU=\
-	"..\..\..\sword2\driver\common\file.h"\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sound\flac.h"\
-	"..\..\..\sword2\driver\sound\mp3.h"\
-	"..\..\..\sword2\driver\sound\rate.h"\
-	"..\..\..\sword2\driver\sound\vorbis.h"\
-	"..\..\..\sword2\driver\sound\wave.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sound.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_D_SOU=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_SOU=\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_D_SOU=\
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_D_SOU=\
-	"..\..\..\common\config.h"\
+	
+NODEP_CPP_CONSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_D_SOU=\
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_SOU=\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_D_SOU=\
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_SOU=\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\driver\menu.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MENU_=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MENU_=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MENU_=\
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MENU_=\
+NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_MENU_=\
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MENU_=\
+NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\console.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\sword2\controls.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-DEP_CPP_MENU_=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MENU_=\
+NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_MENU_=\
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\controls.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\saveload.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_MENU_=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_CONTR=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\driver\palette.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PALET=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\logic.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-NODEP_CPP_PALET=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\logic.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_PALET=\
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1307,33 +1234,32 @@ DEP_CPP_PALET=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PALET=\
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1342,42 +1268,32 @@ DEP_CPP_PALET=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PALET=\
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1386,33 +1302,32 @@ DEP_CPP_PALET=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_PALET=\
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1421,22 +1336,20 @@ DEP_CPP_PALET=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -1444,340 +1357,211 @@ NODEP_CPP_PALET=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\rdwin.cpp
+SOURCE=..\..\..\engines\sword2\controls.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\debug.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_RDWIN=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_RDWIN=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_RDWIN=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_RDWIN=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_RDWIN=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_RDWIN=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_RDWIN=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_RDWIN=\
+	
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_RDWIN=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_RDWIN=\
-	"..\..\..\common\config.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\driver\render.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RENDE=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\graphics\primitives.h"\
-	"..\..\..\sword2\driver\sword2\build_display.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\driver\animation.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RENDE=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\graphics\primitives.h"\
-	"..\..\..\sword2\driver\sword2\build_display.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\driver\animation.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_RENDE=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\graphics\primitives.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_RENDE=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_RENDE=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\graphics\primitives.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_RENDE=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_RENDE=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\graphics\primitives.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_RENDE=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_RENDE=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\graphics\primitives.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_RENDE=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -1785,202 +1569,144 @@ NODEP_CPP_RENDE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\sprite.cpp
+SOURCE=..\..\..\engines\sword2\debug.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\sword2\defs.h
+# End Source File
+# Begin Source File
 
-NODEP_CPP_SPRIT=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\sword2\build_display.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
+SOURCE=..\..\..\engines\sword2\events.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SPRIT=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\sword2\build_display.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SPRIT=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_SPRIT=\
+DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_EVENT=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SPRIT=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_SPRIT=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
 
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=..\..\..\sword2\anims.cpp
+SOURCE=..\..\..\engines\sword2\function.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ANIMS=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\build_display.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\driver\animation.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ANIMS=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\build_display.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\driver\animation.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ANIMS=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -1988,42 +1714,41 @@ DEP_CPP_ANIMS=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ANIMS=\
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_ANIMS=\
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
@@ -2032,53 +1757,41 @@ DEP_CPP_ANIMS=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\animation.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\graphics\animation.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_ANIMS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_ANIMS=\
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -2086,43 +1799,36 @@ DEP_CPP_ANIMS=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ANIMS=\
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ANIMS=\
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -2130,748 +1836,1267 @@ DEP_CPP_ANIMS=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ANIMS=\
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\build_display.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_BUILD=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_BUILD=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_BUILD=\
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_BUILD=\
+	
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_BUILD=\
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_BUILD=\
+	
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\header.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\sword2\icons.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
-DEP_CPP_BUILD=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_BUILD=\
+	
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_BUILD=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_BUILD=\
-	"..\..\..\common\config.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_ICONS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\build_display.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\console.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_CONSO=\
-	"..\..\..\sword2\common\debugger.cpp"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_CONSO=\
-	"..\..\..\sword2\common\debugger.cpp"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CONSO=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CONSO=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CONSO=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ICONS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_ICONS=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_ICONS=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\interpreter.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_INTER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INTER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+
+DEP_CPP_INTER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_INTER=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_INTER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INTER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+
+DEP_CPP_INTER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INTER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+
+DEP_CPP_INTER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INTER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_INTER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INTER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\interpreter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\layers.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_LAYER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_LAYER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+
+DEP_CPP_LAYER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_LAYER=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_LAYER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_LAYER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+
+DEP_CPP_LAYER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_LAYER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+
+DEP_CPP_LAYER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_LAYER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_LAYER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_LAYER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\logic.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\logic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\maketext.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MAKET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_MAKET=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+
+DEP_CPP_MAKET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_MAKET=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_MAKET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_MAKET=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+
+DEP_CPP_MAKET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_MAKET=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+
+DEP_CPP_MAKET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_MAKET=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_MAKET=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_MAKET=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\maketext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\memory.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MEMOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MEMOR=\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+
+DEP_CPP_MEMOR=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_MEMOR=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_MEMOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MEMOR=\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+
+DEP_CPP_MEMOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MEMOR=\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+
+DEP_CPP_MEMOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MEMOR=\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_MEMOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MEMOR=\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\memory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\menu.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MENU_=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_CONSO=\
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_CONSO=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\console.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\controls.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_CONTR=\
-	"..\..\..\sword2\common\config-manager.h"\
-	"..\..\..\sword2\common\rect.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_CONTR=\
-	"..\..\..\sword2\common\config-manager.h"\
-	"..\..\..\sword2\common\rect.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CONTR=\
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONTR=\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CONTR=\
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CONTR=\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CONTR=\
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONTR=\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_CONTR=\
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONTR=\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -2879,620 +3104,480 @@ NODEP_CPP_CONTR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\controls.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\debug.cpp
+SOURCE=..\..\..\engines\sword2\mouse.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_DEBUG=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_DEBUG=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_DEBUG=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.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\sword2.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_DEBUG=\
+NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_DEBUG=\
+DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.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\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\controls.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\saveload.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\graphics\cursorman.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MOUSE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_DEBUG=\
+DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.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\sword2.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_DEBUG=\
+NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_DEBUG=\
+DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.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\sword2.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_DEBUG=\
+NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\events.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_EVENT=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_EVENT=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_EVENT=\
+DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_EVENT=\
+NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_EVENT=\
+DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_EVENT=\
+NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\mouse.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\sword2\music.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-DEP_CPP_EVENT=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_EVENT=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_EVENT=\
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\function.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_FUNCT=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\build_display.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\driver\animation.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_FUNCT=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\build_display.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\driver\animation.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_FUNCT=\
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.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\sword2.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_FUNCT=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_FUNCT=\
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.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\sword2.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_FUNCT=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_FUNCT=\
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.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\sword2.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_FUNCT=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_FUNCT=\
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.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\sword2.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_FUNCT=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -3500,345 +3585,297 @@ NODEP_CPP_FUNCT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\header.h
+SOURCE=..\..\..\engines\sword2\object.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\icons.cpp
+SOURCE=..\..\..\engines\sword2\palette.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ICONS=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ICONS=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ICONS=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ICONS=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_ICONS=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_ICONS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_PALET=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_ICONS=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ICONS=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ICONS=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ICONS=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\icons.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\interpreter.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_INTER=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\util.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_INTER=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\util.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_INTER=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_INTER=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_INTER=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INTER=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\protocol.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-DEP_CPP_INTER=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PROTO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_PROTO=\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+
+DEP_CPP_PROTO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_PROTO=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_PROTO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_PROTO=\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+
+DEP_CPP_PROTO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_PROTO=\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+
+DEP_CPP_PROTO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
 	
-NODEP_CPP_INTER=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_PROTO=\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_INTER=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_PROTO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_INTER=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_PROTO=\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -3846,332 +3883,212 @@ NODEP_CPP_INTER=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\interpreter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\layers.cpp
+SOURCE=..\..\..\engines\sword2\render.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_LAYER=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_LAYER=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_LAYER=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_LAYER=\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_LAYER=\
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\engines\sword2\animation.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\graphics\animation.h"\
+	"..\..\..\graphics\primitives.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_LAYER=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_LAYER=\
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_LAYER=\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_LAYER=\
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_LAYER=\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\layers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\logic.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_LOGIC=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_LOGIC=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_LOGIC=\
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_LOGIC=\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_LOGIC=\
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_LOGIC=\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\resman.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-DEP_CPP_LOGIC=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -4179,37 +4096,37 @@ DEP_CPP_LOGIC=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_LOGIC=\
+NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_LOGIC=\
+DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
@@ -4218,219 +4135,163 @@ DEP_CPP_LOGIC=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_LOGIC=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_RESMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\logic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\maketext.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MAKET=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MAKET=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MAKET=\
+DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MAKET=\
+NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MAKET=\
+DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MAKET=\
+NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MAKET=\
+DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MAKET=\
+NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_MAKET=\
+DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MAKET=\
+NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -4438,32 +4299,50 @@ NODEP_CPP_MAKET=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\maketext.h
+SOURCE=..\..\..\engines\sword2\resman.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\memory.cpp
+SOURCE=..\..\..\engines\sword2\router.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MEMOR=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MEMOR=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ROUTE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ROUTE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_MEMOR=\
+DEP_CPP_ROUTE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -4473,116 +4352,118 @@ DEP_CPP_MEMOR=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_MEMOR=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_ROUTE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MEMOR=\
+DEP_CPP_ROUTE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\stream.h"\
 	
-NODEP_CPP_MEMOR=\
+NODEP_CPP_ROUTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_ROUTE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ROUTE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MEMOR=\
+DEP_CPP_ROUTE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\common\stream.h"\
 	
-NODEP_CPP_MEMOR=\
+NODEP_CPP_ROUTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_MEMOR=\
+DEP_CPP_ROUTE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\common\stream.h"\
 	
-NODEP_CPP_MEMOR=\
+NODEP_CPP_ROUTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -4590,605 +4471,425 @@ NODEP_CPP_MEMOR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\memory.h
+SOURCE=..\..\..\engines\sword2\router.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\mouse.cpp
+SOURCE=..\..\..\engines\sword2\saveload.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MOUSE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MOUSE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_MOUSE=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MOUSE=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\saveload.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_MOUSE=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\saveload.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MOUSE=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_MOUSE=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MOUSE=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\saveload.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MOUSE=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MOUSE=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\saveload.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\mouse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\protocol.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PROTO=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_PROTO=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PROTO=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\common\stream.h"\
 	
-NODEP_CPP_PROTO=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\saveload.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_PROTO=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\stream.h"\
 	
-NODEP_CPP_PROTO=\
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\saveload.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\saveload.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\sword2\screen.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-DEP_CPP_PROTO=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_PROTO=\
+NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_PROTO=\
+DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_PROTO=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SCREE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\resman.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RESMA=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RESMA=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_RESMA=\
+DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_RESMA=\
+NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_RESMA=\
+DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_RESMA=\
+NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_RESMA=\
+DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_RESMA=\
+NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_RESMA=\
+DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_RESMA=\
+NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -5196,71 +4897,41 @@ NODEP_CPP_RESMA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\resman.h
+SOURCE=..\..\..\engines\sword2\screen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\router.cpp
+SOURCE=..\..\..\engines\sword2\scroll.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ROUTE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ROUTE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ROUTE=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCROL=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ROUTE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_SCROL=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_ROUTE=\
+DEP_CPP_SCROL=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -5270,305 +4941,286 @@ DEP_CPP_ROUTE=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_ROUTE=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SCROL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SCROL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SCROL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ROUTE=\
+DEP_CPP_SCROL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\sound.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_ROUTE=\
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_ROUTE=\
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_ROUTE=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SOUND=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\router.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\save_rest.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SAVE_=\
-	"..\..\..\sword2\common\savefile.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SAVE_=\
-	"..\..\..\sword2\common\savefile.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SAVE_=\
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.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"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_SAVE_=\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SAVE_=\
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.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"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_SAVE_=\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SAVE_=\
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.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"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_SAVE_=\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_SAVE_=\
+DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.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"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_SAVE_=\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -5576,161 +5228,200 @@ NODEP_CPP_SAVE_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\save_rest.h
+SOURCE=..\..\..\engines\sword2\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\scroll.cpp
+SOURCE=..\..\..\engines\sword2\speech.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCROL=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SPEEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SPEEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-NODEP_CPP_SCROL=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
+DEP_CPP_SPEEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_SPEEC=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCROL=\
+DEP_CPP_SPEEC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\common\stream.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_SPEEC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCROL=\
+DEP_CPP_SPEEC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\stream.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_SPEEC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCROL=\
+DEP_CPP_SPEEC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\common\stream.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_SPEEC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCROL=\
+DEP_CPP_SPEEC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\common\stream.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_SPEEC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -5738,207 +5429,105 @@ NODEP_CPP_SCROL=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\sound.cpp
+SOURCE=..\..\..\engines\sword2\sprite.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sound\wave.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sound\wave.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SOUND=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SPRIT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_SOUND=\
+DEP_CPP_SPRIT=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SPRIT=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SOUND=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_SPRIT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_SOUND=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_SPRIT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -5946,478 +5535,325 @@ NODEP_CPP_SOUND=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\speech.cpp
+SOURCE=..\..\..\engines\sword2\startup.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SPEEC=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SPEEC=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SPEEC=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_START=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SPEEC=\
+NODEP_CPP_START=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_SPEEC=\
+DEP_CPP_START=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SPEEC=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_START=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SPEEC=\
+DEP_CPP_START=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SPEEC=\
+NODEP_CPP_START=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SPEEC=\
+DEP_CPP_START=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_SPEEC=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\startup.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_START=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
+	
 NODEP_CPP_START=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_START=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_START=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
 DEP_CPP_START=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_START=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\sword2.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-DEP_CPP_START=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SWORD=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_START=\
+NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_START=\
+DEP_CPP_SWORD=\
+	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\controls.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\saveload.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_START=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SWORD=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\sword2.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_SWORD=\
-	"..\..\..\sword2\backends\fs\fs.h"\
-	"..\..\..\sword2\base\options.h"\
-	"..\..\..\sword2\base\plugins.h"\
-	"..\..\..\sword2\common\config-manager.h"\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_SWORD=\
-	"..\..\..\sword2\backends\fs\fs.h"\
-	"..\..\..\sword2\base\options.h"\
-	"..\..\..\sword2\base\plugins.h"\
-	"..\..\..\sword2\common\config-manager.h"\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SWORD=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -6427,49 +5863,41 @@ DEP_CPP_SWORD=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.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\sword2.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SWORD=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -6479,42 +5907,27 @@ DEP_CPP_SWORD=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.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\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SWORD=\
@@ -6522,15 +5935,13 @@ DEP_CPP_SWORD=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -6540,31 +5951,25 @@ DEP_CPP_SWORD=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.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\sword2.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -6574,15 +5979,13 @@ DEP_CPP_SWORD=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -6592,31 +5995,25 @@ DEP_CPP_SWORD=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.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\sword2.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -6624,161 +6021,116 @@ NODEP_CPP_SWORD=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\sword2.h
+SOURCE=..\..\..\engines\sword2\sword2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\sync.cpp
+SOURCE=..\..\..\engines\sword2\sync.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SYNC_=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SYNC_=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_SYNC_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SYNC_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
 DEP_CPP_SYNC_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
 NODEP_CPP_SYNC_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SYNC_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SYNC_=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SYNC_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SYNC_=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SYNC_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SYNC_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
 DEP_CPP_SYNC_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SYNC_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -6786,70 +6138,40 @@ NODEP_CPP_SYNC_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\walker.cpp
+SOURCE=..\..\..\engines\sword2\walker.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_WALKE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_WALKE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_WALKE=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
 DEP_CPP_WALKE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -6859,111 +6181,100 @@ DEP_CPP_WALKE=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_WALKE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_WALKE=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_WALKE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_WALKE=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_WALKE=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
 DEP_CPP_WALKE=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
 
 # End Source File
 # End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
 # End Target
 # End Project
-- 
cgit v1.2.3