From 93c7422879480c83aeb2fd01a313563975c90594 Mon Sep 17 00:00:00 2001
From: Nicolas Bacca
Date: Mon, 5 May 2003 07:28:49 +0000
Subject: Update project build files

svn-id: r7338
---
 backends/wince/PocketSCUMM.rc      |   10 +-
 backends/wince/PocketSCUMM.vcc     |    5 +-
 backends/wince/PocketSCUMM.vcw     |   15 +
 backends/wince/scumm/scumm.vcp     | 2997 +++++++++++++++---------------------
 backends/wince/scummvm/scummvm.vcp | 1070 ++++++++-----
 backends/wince/simon/simon.vcp     |  109 +-
 6 files changed, 1964 insertions(+), 2242 deletions(-)

diff --git a/backends/wince/PocketSCUMM.rc b/backends/wince/PocketSCUMM.rc
index 7cd915720f..2d23d82eaa 100644
--- a/backends/wince/PocketSCUMM.rc
+++ b/backends/wince/PocketSCUMM.rc
@@ -7,7 +7,6 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-
 #include "newres.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -42,16 +41,12 @@ BEGIN
     "resource.h\0"
 END
 
-#if _WIN32_WCE >= 300
-
 2 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "#include ""newres.h""\r\n"
     "\0"
 END
 
-#endif
-
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "\r\n"
@@ -60,7 +55,6 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#if _WIN32_WCE >= 300
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -86,7 +80,8 @@ BEGIN
         BEGIN
             MENUITEM SEPARATOR
         END
-        MENUITEM "Music",                       IDM_SMARTFON_MUSIC
+        MENUITEM "Sound",                       IDM_SMARTFON_SOUND
+        MENUITEM "Help",                        IDM_SMARTFON_HELP
     END
 END
 
@@ -105,7 +100,6 @@ BEGIN
     TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_OPTIONS, 0, 1,
 END
 
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/backends/wince/PocketSCUMM.vcc b/backends/wince/PocketSCUMM.vcc
index e0cc73aa66..f9c0f6d723 100644
--- a/backends/wince/PocketSCUMM.vcc
+++ b/backends/wince/PocketSCUMM.vcc
@@ -78,6 +78,7 @@ Type=1
 Class=?
 Command1=IDM_SMARTFON_SCAN
 Command2=IDM_SMARTFON_QUIT
-Command3=IDM_SMARTFON_MUSIC
-CommandCount=3
+Command3=IDM_SMARTFON_SOUND
+Command4=IDM_SMARTFON_HELP
+CommandCount=4
 
diff --git a/backends/wince/PocketSCUMM.vcw b/backends/wince/PocketSCUMM.vcw
index cb5c1f8b06..812430a164 100644
--- a/backends/wince/PocketSCUMM.vcw
+++ b/backends/wince/PocketSCUMM.vcw
@@ -29,6 +29,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name simon
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name sky
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -45,6 +48,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "sky"=.\sky\sky.vcp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Global:
 
 Package=<5>
diff --git a/backends/wince/scumm/scumm.vcp b/backends/wince/scumm/scumm.vcp
index 304dc7371c..41b7cac3b4 100644
--- a/backends/wince/scumm/scumm.vcp
+++ b/backends/wince/scumm/scumm.vcp
@@ -54,7 +54,7 @@ CFG=scumm - Win32 (WCE MIPS) Debug
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "NONSTANDARD_PORT" /YX /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -106,7 +106,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -132,7 +132,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /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 "SHx" /D "SH3" /D "_SH3_" /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 "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "NONSTANDARD_PORT" /YX /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -158,7 +158,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" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /O2 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "_LIB" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /FR /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /O2 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "_LIB" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "USE_VORBIS" /D "NONSTANDARD_PORT" /FR /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -184,7 +184,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "_LIB" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "_LIB" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "USE_VORBIS" /D "NONSTANDARD_PORT" /YX /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -264,129 +264,138 @@ BSC32=bscmake.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\blitter.cpp
+SOURCE=..\..\..\scumm\smush\channel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\scumm\smush\chunk.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_BLITT=\
-	"..\..\..\common\rect.h"\
+DEP_CPP_CHUNK=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\smush\blitter.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_BLITT=\
+NODEP_CPP_CHUNK=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_BLITT=\
-	"..\..\..\scumm\smush\blitter.h"\
+DEP_CPP_CHUNK=\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
 	
-NODEP_CPP_BLITT=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\stdafx.h"\
+NODEP_CPP_CHUNK=\
+	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\file.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
+	"..\..\..\scumm\smush\common\str.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_BLITT=\
-	"..\..\..\common\rect.h"\
+DEP_CPP_CHUNK=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\smush\blitter.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_BLITT=\
+NODEP_CPP_CHUNK=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_BLITT=\
-	"..\..\..\scumm\smush\blitter.h"\
+DEP_CPP_CHUNK=\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
 	
-NODEP_CPP_BLITT=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\stdafx.h"\
+NODEP_CPP_CHUNK=\
+	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\file.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
+	"..\..\..\scumm\smush\common\str.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_BLITT=\
-	"..\..\..\common\rect.h"\
+DEP_CPP_CHUNK=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\smush\blitter.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_BLITT=\
+NODEP_CPP_CHUNK=\
 	"..\..\..\common\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_BLITT=\
-	"..\..\..\common\rect.h"\
+DEP_CPP_CHUNK=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\smush\blitter.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_BLITT=\
+NODEP_CPP_CHUNK=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_BLITT=\
-	"..\..\..\scumm\smush\blitter.h"\
+DEP_CPP_CHUNK=\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
 	
-NODEP_CPP_BLITT=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\stdafx.h"\
+NODEP_CPP_CHUNK=\
+	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\file.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
+	"..\..\..\scumm\smush\common\str.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_BLITT=\
-	"..\..\..\scumm\smush\blitter.h"\
+DEP_CPP_CHUNK=\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
 	
-NODEP_CPP_BLITT=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\stdafx.h"\
+NODEP_CPP_CHUNK=\
+	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\file.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
+	"..\..\..\scumm\smush\common\str.h"\
 	
 
 !ENDIF 
@@ -394,153 +403,90 @@ NODEP_CPP_BLITT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\blitter.h
+SOURCE=..\..\..\scumm\smush\chunk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\scumm\smush\chunk_type.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\brenderer.cpp
+SOURCE=..\..\..\scumm\smush\codec1.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_BREND=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+DEP_CPP_CODEC=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_BREND=\
+NODEP_CPP_CODEC=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_BREND=\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	
-NODEP_CPP_BREND=\
-	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+NODEP_CPP_CODEC=\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_BREND=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+DEP_CPP_CODEC=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_BREND=\
+NODEP_CPP_CODEC=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_BREND=\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	
-NODEP_CPP_BREND=\
-	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+NODEP_CPP_CODEC=\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_BREND=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+DEP_CPP_CODEC=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_BREND=\
+NODEP_CPP_CODEC=\
 	"..\..\..\common\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_BREND=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+DEP_CPP_CODEC=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_BREND=\
+NODEP_CPP_CODEC=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_BREND=\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	
-NODEP_CPP_BREND=\
-	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+NODEP_CPP_CODEC=\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_BREND=\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	
-NODEP_CPP_BREND=\
-	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+NODEP_CPP_CODEC=\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ENDIF 
@@ -548,145 +494,114 @@ NODEP_CPP_BREND=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\brenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\channel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\chunk.cpp
+SOURCE=..\..\..\scumm\smush\codec37.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CHUNK=\
+DEP_CPP_CODEC3=\
 	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\codec37.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_CODEC3=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CHUNK=\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
+DEP_CPP_CODEC3=\
+	"..\..\..\scumm\smush\codec37.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_CODEC3=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\str.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CHUNK=\
+DEP_CPP_CODEC3=\
 	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\codec37.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_CODEC3=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CHUNK=\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
+DEP_CPP_CODEC3=\
+	"..\..\..\scumm\smush\codec37.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_CODEC3=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\str.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CHUNK=\
+DEP_CPP_CODEC3=\
 	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\codec37.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_CODEC3=\
 	"..\..\..\common\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CHUNK=\
+DEP_CPP_CODEC3=\
 	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\codec37.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_CODEC3=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_CHUNK=\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
+DEP_CPP_CODEC3=\
+	"..\..\..\scumm\smush\codec37.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_CODEC3=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\str.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_CHUNK=\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\config.h"\
+DEP_CPP_CODEC3=\
+	"..\..\..\scumm\smush\codec37.h"\
 	
-NODEP_CPP_CHUNK=\
+NODEP_CPP_CODEC3=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\str.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ENDIF 
@@ -694,141 +609,118 @@ 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=..\..\..\scumm\smush\codec37.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\codec1.cpp
+SOURCE=..\..\..\scumm\smush\codec47.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CODEC=\
-	"..\..\..\common\rect.h"\
+DEP_CPP_CODEC4=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\scumm\smush\codec47.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CODEC=\
+NODEP_CPP_CODEC4=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CODEC=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+DEP_CPP_CODEC4=\
+	"..\..\..\scumm\smush\codec47.h"\
 	
-NODEP_CPP_CODEC=\
-	"..\..\..\scumm\smush\common\rect.h"\
+NODEP_CPP_CODEC4=\
+	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CODEC=\
-	"..\..\..\common\rect.h"\
+DEP_CPP_CODEC4=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\scumm\smush\codec47.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CODEC=\
+NODEP_CPP_CODEC4=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CODEC=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+DEP_CPP_CODEC4=\
+	"..\..\..\scumm\smush\codec47.h"\
 	
-NODEP_CPP_CODEC=\
-	"..\..\..\scumm\smush\common\rect.h"\
+NODEP_CPP_CODEC4=\
+	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CODEC=\
-	"..\..\..\common\rect.h"\
+DEP_CPP_CODEC4=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\scumm\smush\codec47.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CODEC=\
+NODEP_CPP_CODEC4=\
 	"..\..\..\common\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CODEC=\
-	"..\..\..\common\rect.h"\
+DEP_CPP_CODEC4=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\scumm\smush\codec47.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CODEC=\
+NODEP_CPP_CODEC4=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_CODEC=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+DEP_CPP_CODEC4=\
+	"..\..\..\scumm\smush\codec47.h"\
 	
-NODEP_CPP_CODEC=\
-	"..\..\..\scumm\smush\common\rect.h"\
+NODEP_CPP_CODEC4=\
+	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_CODEC=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+DEP_CPP_CODEC4=\
+	"..\..\..\scumm\smush\codec47.h"\
 	
-NODEP_CPP_CODEC=\
-	"..\..\..\scumm\smush\common\rect.h"\
+NODEP_CPP_CODEC4=\
+	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ENDIF 
@@ -836,153 +728,134 @@ NODEP_CPP_CODEC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\codec1.h
+SOURCE=..\..\..\scumm\smush\codec47.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\codec37.cpp
+SOURCE=..\..\..\scumm\smush\imuse_channel.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CODEC3=\
+DEP_CPP_IMUSE=\
 	"..\..\..\common\engine.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\blitter.h"\
+	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\chunk_type.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CODEC3=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CODEC3=\
-	"..\..\..\scumm\smush\blitter.h"\
+DEP_CPP_IMUSE=\
+	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\chunk_type.h"\
 	
-NODEP_CPP_CODEC3=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CODEC3=\
+DEP_CPP_IMUSE=\
 	"..\..\..\common\engine.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\blitter.h"\
+	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\chunk_type.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CODEC3=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CODEC3=\
-	"..\..\..\scumm\smush\blitter.h"\
+DEP_CPP_IMUSE=\
+	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\chunk_type.h"\
 	
-NODEP_CPP_CODEC3=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CODEC3=\
+DEP_CPP_IMUSE=\
 	"..\..\..\common\engine.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\blitter.h"\
+	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\chunk_type.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CODEC3=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\common\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CODEC3=\
+DEP_CPP_IMUSE=\
 	"..\..\..\common\engine.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\blitter.h"\
+	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\chunk_type.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CODEC3=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_CODEC3=\
-	"..\..\..\scumm\smush\blitter.h"\
+DEP_CPP_IMUSE=\
+	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\chunk_type.h"\
 	
-NODEP_CPP_CODEC3=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_CODEC3=\
-	"..\..\..\scumm\smush\blitter.h"\
+DEP_CPP_IMUSE=\
+	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\chunk_type.h"\
 	
-NODEP_CPP_CODEC3=\
+NODEP_CPP_IMUSE=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ENDIF 
@@ -990,715 +863,42 @@ NODEP_CPP_CODEC3=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\codec37.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\codec44.cpp
+SOURCE=..\..\..\scumm\smush\saud_channel.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CODEC4=\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_CODEC4=\
-	"..\..\..\common\macos.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_CODEC4=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	
-NODEP_CPP_CODEC4=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
-
-DEP_CPP_CODEC4=\
-	"..\..\..\common\rect.h"\
+DEP_CPP_SAUD_=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\blitter.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\chunk_type.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_CODEC4=\
-	"..\..\..\common\macos.h"\
 	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CODEC4=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	
-NODEP_CPP_CODEC4=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-DEP_CPP_CODEC4=\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-NODEP_CPP_CODEC4=\
-	"..\..\..\common\macos.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CODEC4=\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_CODEC4=\
-	"..\..\..\common\macos.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
-
-DEP_CPP_CODEC4=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	
-NODEP_CPP_CODEC4=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
-
-DEP_CPP_CODEC4=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	
-NODEP_CPP_CODEC4=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\codec44.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\codec47.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-DEP_CPP_CODEC47=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\gameDetector.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_CODEC47=\
-	"..\..\..\common\macos.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_CODEC47=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	
-NODEP_CPP_CODEC47=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\engine.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
-
-DEP_CPP_CODEC47=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\gameDetector.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_CODEC47=\
-	"..\..\..\common\macos.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_CODEC47=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	
-NODEP_CPP_CODEC47=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\engine.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-DEP_CPP_CODEC47=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\gameDetector.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-NODEP_CPP_CODEC47=\
-	"..\..\..\common\macos.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CODEC47=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\gameDetector.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_CODEC47=\
-	"..\..\..\common\macos.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
-
-DEP_CPP_CODEC47=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	
-NODEP_CPP_CODEC47=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\engine.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
-
-DEP_CPP_CODEC47=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	
-NODEP_CPP_CODEC47=\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\engine.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\codec47.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\color.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-DEP_CPP_COLOR=\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_COLOR=\
-	"..\..\..\common\macos.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_COLOR=\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
-
-DEP_CPP_COLOR=\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_COLOR=\
-	"..\..\..\common\macos.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_COLOR=\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-DEP_CPP_COLOR=\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-NODEP_CPP_COLOR=\
-	"..\..\..\common\macos.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_COLOR=\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_COLOR=\
-	"..\..\..\common\macos.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
-
-DEP_CPP_COLOR=\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
-
-DEP_CPP_COLOR=\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\color.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\frenderer.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-DEP_CPP_FREND=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\gameDetector.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_FREND=\
-	"..\..\..\common\macos.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_FREND=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	
-NODEP_CPP_FREND=\
-	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
-
-DEP_CPP_FREND=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\gameDetector.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_FREND=\
-	"..\..\..\common\macos.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_FREND=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	
-NODEP_CPP_FREND=\
-	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
-
-DEP_CPP_FREND=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\gameDetector.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-NODEP_CPP_FREND=\
-	"..\..\..\common\macos.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_FREND=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\gameDetector.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_FREND=\
-	"..\..\..\common\macos.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
-
-DEP_CPP_FREND=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	
-NODEP_CPP_FREND=\
-	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
-
-DEP_CPP_FREND=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	
-NODEP_CPP_FREND=\
-	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
-	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\scumm.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\frenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\imuse_channel.cpp
-
-!IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
-
-DEP_CPP_IMUSE=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_SAUD_=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_IMUSE=\
+DEP_CPP_SAUD_=\
 	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
 	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_SAUD_=\
 	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_IMUSE=\
+DEP_CPP_SAUD_=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1707,30 +907,29 @@ DEP_CPP_IMUSE=\
 	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
 	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_SAUD_=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_IMUSE=\
+DEP_CPP_SAUD_=\
 	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
 	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_SAUD_=\
 	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_IMUSE=\
+DEP_CPP_SAUD_=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1739,17 +938,17 @@ DEP_CPP_IMUSE=\
 	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
 	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_SAUD_=\
 	"..\..\..\common\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_IMUSE=\
+DEP_CPP_SAUD_=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1758,37 +957,36 @@ DEP_CPP_IMUSE=\
 	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
 	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_SAUD_=\
 	"..\..\..\common\macos.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_IMUSE=\
+DEP_CPP_SAUD_=\
 	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
 	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_SAUD_=\
 	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_IMUSE=\
+DEP_CPP_SAUD_=\
 	"..\..\..\scumm\smush\channel.h"\
 	"..\..\..\scumm\smush\chunk.h"\
 	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
 	
-NODEP_CPP_IMUSE=\
+NODEP_CPP_SAUD_=\
 	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	
 
 !ENDIF 
@@ -1796,25 +994,16 @@ NODEP_CPP_IMUSE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\mixer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\palette.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\player.cpp
+SOURCE=..\..\..\scumm\smush\smush_font.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PLAYE=\
+DEP_CPP_SMUSH=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -1825,73 +1014,37 @@ DEP_CPP_PLAYE=\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\scumm\smush\smush_font.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_SMUSH=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PLAYE=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
+DEP_CPP_SMUSH=\
+	"..\..\..\scumm\smush\smush_font.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_SMUSH=\
 	"..\..\..\scumm\smush\common\engine.h"\
 	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	"..\..\..\scumm\smush\common\util.h"\
 	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\sound\mixer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PLAYE=\
+DEP_CPP_SMUSH=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -1902,73 +1055,37 @@ DEP_CPP_PLAYE=\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\scumm\smush\smush_font.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_SMUSH=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PLAYE=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
+DEP_CPP_SMUSH=\
+	"..\..\..\scumm\smush\smush_font.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_SMUSH=\
 	"..\..\..\scumm\smush\common\engine.h"\
 	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	"..\..\..\scumm\smush\common\util.h"\
 	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\sound\mixer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_PLAYE=\
+DEP_CPP_SMUSH=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -1979,41 +1096,24 @@ DEP_CPP_PLAYE=\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\scumm\smush\smush_font.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_SMUSH=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_PLAYE=\
+DEP_CPP_SMUSH=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -2024,92 +1124,40 @@ DEP_CPP_PLAYE=\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\sound\mixer.h"\
+	"..\..\..\scumm\smush\smush_font.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_SMUSH=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_PLAYE=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
+DEP_CPP_SMUSH=\
+	"..\..\..\scumm\smush\smush_font.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_SMUSH=\
 	"..\..\..\scumm\smush\common\engine.h"\
 	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	"..\..\..\scumm\smush\common\util.h"\
 	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\sound\mixer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_PLAYE=\
-	"..\..\..\scumm\smush\blitter.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
-	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\frenderer.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
+DEP_CPP_SMUSH=\
+	"..\..\..\scumm\smush\smush_font.h"\
 	
-NODEP_CPP_PLAYE=\
+NODEP_CPP_SMUSH=\
 	"..\..\..\scumm\smush\common\engine.h"\
 	"..\..\..\scumm\smush\common\file.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	"..\..\..\scumm\smush\common\util.h"\
 	"..\..\..\scumm\smush\scumm\scumm.h"\
-	"..\..\..\scumm\smush\sound\mixer.h"\
 	
 
 !ENDIF 
@@ -2117,141 +1165,207 @@ NODEP_CPP_PLAYE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\player.h
+SOURCE=..\..\..\scumm\smush\smush_font.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\renderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\scumm\smush\saud_channel.cpp
+SOURCE=..\..\..\scumm\smush\smush_mixer.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_SMUSH_=\
 	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\imuse.h"\
+	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\smush_mixer.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_SMUSH_=\
 	"..\..\..\common\macos.h"\
+	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_SMUSH_=\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\smush_mixer.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_SMUSH_=\
 	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\scumm\imuse.h"\
+	"..\..\..\scumm\smush\scumm\scumm.h"\
+	"..\..\..\scumm\smush\scumm\sound.h"\
+	"..\..\..\scumm\smush\sound\mixer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_SMUSH_=\
 	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\imuse.h"\
+	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\smush_mixer.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_SMUSH_=\
 	"..\..\..\common\macos.h"\
+	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_SMUSH_=\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\smush_mixer.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_SMUSH_=\
 	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\scumm\imuse.h"\
+	"..\..\..\scumm\smush\scumm\scumm.h"\
+	"..\..\..\scumm\smush\scumm\sound.h"\
+	"..\..\..\scumm\smush\sound\mixer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_SMUSH_=\
 	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\imuse.h"\
+	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\smush_mixer.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_SMUSH_=\
 	"..\..\..\common\macos.h"\
+	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_SMUSH_=\
 	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\imuse.h"\
+	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\smush_mixer.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_SMUSH_=\
 	"..\..\..\common\macos.h"\
+	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_SMUSH_=\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\smush_mixer.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_SMUSH_=\
 	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\scumm\imuse.h"\
+	"..\..\..\scumm\smush\scumm\scumm.h"\
+	"..\..\..\scumm\smush\scumm\sound.h"\
+	"..\..\..\scumm\smush\sound\mixer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_SAUD_=\
+DEP_CPP_SMUSH_=\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\chunk_type.h"\
-	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\smush_mixer.h"\
 	
-NODEP_CPP_SAUD_=\
+NODEP_CPP_SMUSH_=\
 	"..\..\..\scumm\smush\common\engine.h"\
+	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\scumm\imuse.h"\
+	"..\..\..\scumm\smush\scumm\scumm.h"\
+	"..\..\..\scumm\smush\scumm\sound.h"\
+	"..\..\..\scumm\smush\sound\mixer.h"\
 	
 
 !ENDIF 
@@ -2259,17 +1373,20 @@ NODEP_CPP_SAUD_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\scumm_renderer.cpp
+SOURCE=..\..\..\scumm\smush\smush_mixer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\scumm\smush\smush_player.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCUMM=\
+DEP_CPP_SMUSH_P=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -2277,50 +1394,50 @@ DEP_CPP_SCUMM=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
 	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.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"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SMUSH_P=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\scumm\smush\brenderer.h"\
+DEP_CPP_SMUSH_P=\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.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"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SMUSH_P=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\file.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\actor.h"\
 	"..\..\..\scumm\smush\scumm\imuse.h"\
+	"..\..\..\scumm\smush\scumm\imuse_digi.h"\
 	"..\..\..\scumm\smush\scumm\scumm.h"\
 	"..\..\..\scumm\smush\scumm\sound.h"\
 	"..\..\..\scumm\smush\sound\mixer.h"\
@@ -2328,13 +1445,12 @@ NODEP_CPP_SCUMM=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCUMM=\
+DEP_CPP_SMUSH_P=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -2342,50 +1458,50 @@ DEP_CPP_SCUMM=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
 	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.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"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SMUSH_P=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\scumm\smush\brenderer.h"\
+DEP_CPP_SMUSH_P=\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.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"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SMUSH_P=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\file.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\actor.h"\
 	"..\..\..\scumm\smush\scumm\imuse.h"\
+	"..\..\..\scumm\smush\scumm\imuse_digi.h"\
 	"..\..\..\scumm\smush\scumm\scumm.h"\
 	"..\..\..\scumm\smush\scumm\sound.h"\
 	"..\..\..\scumm\smush\sound\mixer.h"\
@@ -2393,13 +1509,12 @@ NODEP_CPP_SCUMM=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCUMM=\
+DEP_CPP_SMUSH_P=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -2407,39 +1522,39 @@ DEP_CPP_SCUMM=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
 	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.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"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SMUSH_P=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCUMM=\
+DEP_CPP_SMUSH_P=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -2447,50 +1562,55 @@ DEP_CPP_SCUMM=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
 	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.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"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SMUSH_P=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\scumm\smush\brenderer.h"\
+DEP_CPP_SMUSH_P=\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.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"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SMUSH_P=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\file.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\actor.h"\
 	"..\..\..\scumm\smush\scumm\imuse.h"\
+	"..\..\..\scumm\smush\scumm\imuse_digi.h"\
 	"..\..\..\scumm\smush\scumm\scumm.h"\
 	"..\..\..\scumm\smush\scumm\sound.h"\
 	"..\..\..\scumm\smush\sound\mixer.h"\
@@ -2498,22 +1618,23 @@ NODEP_CPP_SCUMM=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\scumm\smush\brenderer.h"\
+DEP_CPP_SMUSH_P=\
 	"..\..\..\scumm\smush\channel.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\mixer.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.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"\
 	
-NODEP_CPP_SCUMM=\
+NODEP_CPP_SMUSH_P=\
 	"..\..\..\scumm\smush\common\engine.h"\
-	"..\..\..\scumm\smush\common\rect.h"\
+	"..\..\..\scumm\smush\common\file.h"\
+	"..\..\..\scumm\smush\common\scummsys.h"\
 	"..\..\..\scumm\smush\common\util.h"\
-	"..\..\..\scumm\smush\scumm\actor.h"\
 	"..\..\..\scumm\smush\scumm\imuse.h"\
+	"..\..\..\scumm\smush\scumm\imuse_digi.h"\
 	"..\..\..\scumm\smush\scumm\scumm.h"\
 	"..\..\..\scumm\smush\scumm\sound.h"\
 	"..\..\..\scumm\smush\sound\mixer.h"\
@@ -2524,7 +1645,7 @@ NODEP_CPP_SCUMM=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\scumm\smush\scumm_renderer.h
+SOURCE=..\..\..\scumm\smush\smush_player.h
 # End Source File
 # End Group
 # Begin Source File
@@ -2560,12 +1681,12 @@ DEP_CPP_ACTOR=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ACTOR=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -2626,12 +1747,12 @@ DEP_CPP_ACTOR=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ACTOR=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -2692,6 +1813,8 @@ DEP_CPP_ACTOR=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ACTOR=\
 	"..\..\..\common\macos.h"\
@@ -2727,12 +1850,17 @@ DEP_CPP_ACTOR=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ACTOR=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -2829,11 +1957,11 @@ DEP_CPP_AKOS_=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AKOS_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -2885,11 +2013,11 @@ DEP_CPP_AKOS_=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AKOS_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -2937,10 +2065,13 @@ DEP_CPP_AKOS_=\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AKOS_=\
 	"..\..\..\common\macos.h"\
@@ -2968,15 +2099,22 @@ DEP_CPP_AKOS_=\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AKOS_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -3063,11 +2201,11 @@ DEP_CPP_BOXES=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOXES=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -3111,11 +2249,11 @@ DEP_CPP_BOXES=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOXES=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -3159,6 +2297,7 @@ DEP_CPP_BOXES=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOXES=\
 	"..\..\..\common\macos.h"\
@@ -3186,11 +2325,11 @@ DEP_CPP_BOXES=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BOXES=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -3265,11 +2404,11 @@ DEP_CPP_BUNDL=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BUNDL=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -3314,11 +2453,11 @@ DEP_CPP_BUNDL=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BUNDL=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -3363,6 +2502,7 @@ DEP_CPP_BUNDL=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BUNDL=\
 	"..\..\..\common\macos.h"\
@@ -3390,11 +2530,11 @@ DEP_CPP_BUNDL=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BUNDL=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -3472,11 +2612,11 @@ DEP_CPP_CHARS=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -3522,11 +2662,11 @@ DEP_CPP_CHARS=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -3572,6 +2712,7 @@ DEP_CPP_CHARS=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\..\common\macos.h"\
@@ -3600,11 +2741,11 @@ DEP_CPP_CHARS=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHARS=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -3685,12 +2826,12 @@ DEP_CPP_COSTU=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COSTU=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -3741,12 +2882,12 @@ DEP_CPP_COSTU=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COSTU=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -3797,6 +2938,8 @@ DEP_CPP_COSTU=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COSTU=\
 	"..\..\..\common\macos.h"\
@@ -3828,12 +2971,17 @@ DEP_CPP_COSTU=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COSTU=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -3920,11 +3068,11 @@ DEP_CPP_DEBUG=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -3977,11 +3125,11 @@ DEP_CPP_DEBUG=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -4034,6 +3182,7 @@ DEP_CPP_DEBUG=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\macos.h"\
@@ -4067,11 +3216,11 @@ DEP_CPP_DEBUG=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -4159,12 +3308,12 @@ DEP_CPP_DEBUGG=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUGG=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -4220,12 +3369,12 @@ DEP_CPP_DEBUGG=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUGG=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -4281,6 +3430,8 @@ DEP_CPP_DEBUGG=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUGG=\
 	"..\..\..\common\macos.h"\
@@ -4315,12 +3466,17 @@ DEP_CPP_DEBUGG=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUGG=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -4476,12 +3632,12 @@ DEP_CPP_DIALO=\
 	"..\gapi_keys.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DIALO=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -4548,12 +3704,12 @@ DEP_CPP_DIALO=\
 	"..\gapi_keys.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DIALO=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -4611,7 +3767,6 @@ DEP_CPP_DIALO=\
 	"..\..\..\scumm\dialogs.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
@@ -4620,6 +3775,13 @@ DEP_CPP_DIALO=\
 	"..\gapi_keys.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_DIALO=\
 	"..\..\..\common\macos.h"\
@@ -4650,7 +3812,6 @@ DEP_CPP_DIALO=\
 	"..\..\..\scumm\dialogs.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
@@ -4659,12 +3820,17 @@ DEP_CPP_DIALO=\
 	"..\gapi_keys.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DIALO=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -4764,11 +3930,11 @@ DEP_CPP_GFX_C=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GFX_C=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -4818,11 +3984,11 @@ DEP_CPP_GFX_C=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GFX_C=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -4872,6 +4038,7 @@ DEP_CPP_GFX_C=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GFX_C=\
 	"..\..\..\common\macos.h"\
@@ -4902,11 +4069,11 @@ DEP_CPP_GFX_C=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GFX_C=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -4994,12 +4161,12 @@ DEP_CPP_IMUSE_=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -5044,12 +4211,12 @@ DEP_CPP_IMUSE_=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -5084,7 +4251,6 @@ DEP_CPP_IMUSE_=\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\instrument.h"\
 	"..\..\..\scumm\saveload.h"\
 	"..\..\..\scumm\scumm.h"\
@@ -5094,6 +4260,8 @@ DEP_CPP_IMUSE_=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_=\
 	"..\..\..\common\macos.h"\
@@ -5118,7 +4286,6 @@ DEP_CPP_IMUSE_=\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\instrument.h"\
 	"..\..\..\scumm\saveload.h"\
 	"..\..\..\scumm\scumm.h"\
@@ -5128,12 +4295,17 @@ DEP_CPP_IMUSE_=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -5198,12 +4370,12 @@ DEP_CPP_IMUSE_D=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_D=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -5238,12 +4410,12 @@ DEP_CPP_IMUSE_D=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_D=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -5278,6 +4450,8 @@ DEP_CPP_IMUSE_D=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_D=\
 	"..\..\..\common\macos.h"\
@@ -5307,12 +4481,17 @@ DEP_CPP_IMUSE_D=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_IMUSE_D=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -5367,11 +4546,11 @@ DEP_CPP_INSTR=\
 	"..\..\..\sound\mididrv.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INSTR=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -5407,11 +4586,11 @@ DEP_CPP_INSTR=\
 	"..\..\..\sound\mididrv.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INSTR=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -5447,6 +4626,7 @@ DEP_CPP_INSTR=\
 	"..\..\..\sound\mididrv.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INSTR=\
 	"..\..\..\common\macos.h"\
@@ -5476,11 +4656,11 @@ DEP_CPP_INSTR=\
 	"..\..\..\sound\mididrv.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_INSTR=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -5539,11 +4719,11 @@ DEP_CPP_NUT_R=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NUT_R=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -5586,11 +4766,11 @@ DEP_CPP_NUT_R=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NUT_R=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -5633,6 +4813,7 @@ DEP_CPP_NUT_R=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NUT_R=\
 	"..\..\..\common\macos.h"\
@@ -5660,11 +4841,11 @@ DEP_CPP_NUT_R=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NUT_R=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -5740,11 +4921,11 @@ DEP_CPP_OBJEC=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -5794,11 +4975,11 @@ DEP_CPP_OBJEC=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -5848,6 +5029,7 @@ DEP_CPP_OBJEC=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\..\common\macos.h"\
@@ -5878,11 +5060,11 @@ DEP_CPP_OBJEC=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OBJEC=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -5970,12 +5152,12 @@ DEP_CPP_RESOU=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -6031,12 +5213,12 @@ DEP_CPP_RESOU=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -6083,6 +5265,7 @@ DEP_CPP_RESOU=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\widget.h"\
 	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\bundle.h"\
 	"..\..\..\scumm\dialogs.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\resource.h"\
@@ -6092,6 +5275,8 @@ DEP_CPP_RESOU=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\..\common\macos.h"\
@@ -6126,12 +5311,17 @@ DEP_CPP_RESOU=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOU=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -6217,11 +5407,11 @@ DEP_CPP_RESOUR=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOUR=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -6266,11 +5456,11 @@ DEP_CPP_RESOUR=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOUR=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -6315,6 +5505,7 @@ DEP_CPP_RESOUR=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOUR=\
 	"..\..\..\common\macos.h"\
@@ -6343,11 +5534,11 @@ DEP_CPP_RESOUR=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOUR=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -6419,11 +5610,11 @@ DEP_CPP_RESOURC=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURC=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -6468,11 +5659,11 @@ DEP_CPP_RESOURC=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURC=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -6517,6 +5708,7 @@ DEP_CPP_RESOURC=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURC=\
 	"..\..\..\common\macos.h"\
@@ -6545,11 +5737,11 @@ DEP_CPP_RESOURC=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURC=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -6620,11 +5812,11 @@ DEP_CPP_RESOURCE=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURCE=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -6667,11 +5859,11 @@ DEP_CPP_RESOURCE=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURCE=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -6714,6 +5906,7 @@ DEP_CPP_RESOURCE=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURCE=\
 	"..\..\..\common\macos.h"\
@@ -6741,11 +5934,11 @@ DEP_CPP_RESOURCE=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESOURCE=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -6824,12 +6017,12 @@ DEP_CPP_SAVEL=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVEL=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -6894,12 +6087,12 @@ DEP_CPP_SAVEL=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVEL=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -6960,10 +6153,11 @@ DEP_CPP_SAVEL=\
 	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVEL=\
 	"..\..\..\common\macos.h"\
@@ -6997,16 +6191,20 @@ DEP_CPP_SAVEL=\
 	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
-	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVEL=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -7104,11 +6302,11 @@ DEP_CPP_SCRIP=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCRIP=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -7150,27 +6348,252 @@ DEP_CPP_SCRIP=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\missing\unistd.h"\
+	"..\portdefs.h"\
+	
+NODEP_CPP_SCRIP=\
+	"..\..\..\common\macos.h"\
+	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SCRIP=\
+	"..\..\..\scumm\actor.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\scumm.h"\
+	
+NODEP_CPP_SCRIP=\
+	"..\..\..\scumm\common\engine.h"\
+	"..\..\..\scumm\common\file.h"\
+	"..\..\..\scumm\common\gameDetector.h"\
+	"..\..\..\scumm\common\map.h"\
+	"..\..\..\scumm\common\scummsys.h"\
+	"..\..\..\scumm\common\str.h"\
+	"..\..\..\scumm\common\timer.h"\
+	"..\..\..\scumm\common\util.h"\
+	"..\..\..\scumm\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
+
+DEP_CPP_SCRIP=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\scumm\actor.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\missing\unistd.h"\
+	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	
+NODEP_CPP_SCRIP=\
+	"..\..\..\common\macos.h"\
+	"..\..\..\common\morphos_timer.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCRIP=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\scumm\actor.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\missing\unistd.h"\
+	"..\portdefs.h"\
+	
+NODEP_CPP_SCRIP=\
+	"..\..\..\common\macos.h"\
+	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
+
+DEP_CPP_SCRIP=\
+	"..\..\..\scumm\actor.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\scumm.h"\
+	
+NODEP_CPP_SCRIP=\
+	"..\..\..\scumm\common\engine.h"\
+	"..\..\..\scumm\common\file.h"\
+	"..\..\..\scumm\common\gameDetector.h"\
+	"..\..\..\scumm\common\map.h"\
+	"..\..\..\scumm\common\scummsys.h"\
+	"..\..\..\scumm\common\str.h"\
+	"..\..\..\scumm\common\timer.h"\
+	"..\..\..\scumm\common\util.h"\
+	"..\..\..\scumm\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
+
+DEP_CPP_SCRIP=\
+	"..\..\..\scumm\actor.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\scumm.h"\
+	
+NODEP_CPP_SCRIP=\
+	"..\..\..\scumm\common\engine.h"\
+	"..\..\..\scumm\common\file.h"\
+	"..\..\..\scumm\common\gameDetector.h"\
+	"..\..\..\scumm\common\map.h"\
+	"..\..\..\scumm\common\scummsys.h"\
+	"..\..\..\scumm\common\str.h"\
+	"..\..\..\scumm\common\timer.h"\
+	"..\..\..\scumm\common\util.h"\
+	"..\..\..\scumm\stdafx.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\scumm\script_v2.cpp
+
+!IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SCRIPT=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\scumm\actor.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\charset.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\intern.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\verbs.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\missing\unistd.h"\
+	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	
+NODEP_CPP_SCRIPT=\
+	"..\..\..\common\macos.h"\
+	"..\..\..\common\morphos_timer.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SCRIPT=\
+	"..\..\..\scumm\actor.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\charset.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\intern.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\verbs.h"\
+	
+NODEP_CPP_SCRIPT=\
+	"..\..\..\scumm\common\engine.h"\
+	"..\..\..\scumm\common\file.h"\
+	"..\..\..\scumm\common\gameDetector.h"\
+	"..\..\..\scumm\common\map.h"\
+	"..\..\..\scumm\common\scummsys.h"\
+	"..\..\..\scumm\common\str.h"\
+	"..\..\..\scumm\common\timer.h"\
+	"..\..\..\scumm\common\util.h"\
+	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\sound\mixer.h"\
+	"..\..\..\scumm\stdafx.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
+
+DEP_CPP_SCRIPT=\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\scumm\actor.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\charset.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\verbs.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIP=\
+NODEP_CPP_SCRIPT=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIP=\
+DEP_CPP_SCRIPT=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIP=\
+NODEP_CPP_SCRIPT=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7179,12 +6602,14 @@ NODEP_CPP_SCRIP=\
 	"..\..\..\scumm\common\str.h"\
 	"..\..\..\scumm\common\timer.h"\
 	"..\..\..\scumm\common\util.h"\
+	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIP=\
+DEP_CPP_SCRIPT=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
@@ -7199,20 +6624,31 @@ DEP_CPP_SCRIP=\
 	"..\..\..\common\util.h"\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\verbs.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
-NODEP_CPP_SCRIP=\
+NODEP_CPP_SCRIPT=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCRIP=\
+DEP_CPP_SCRIPT=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
@@ -7227,28 +6663,41 @@ DEP_CPP_SCRIP=\
 	"..\..\..\common\util.h"\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\verbs.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
-NODEP_CPP_SCRIP=\
+NODEP_CPP_SCRIPT=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_SCRIP=\
+DEP_CPP_SCRIPT=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIP=\
+NODEP_CPP_SCRIPT=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7257,19 +6706,24 @@ NODEP_CPP_SCRIP=\
 	"..\..\..\scumm\common\str.h"\
 	"..\..\..\scumm\common\timer.h"\
 	"..\..\..\scumm\common\util.h"\
+	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_SCRIP=\
+DEP_CPP_SCRIPT=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\resource.h"\
+	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIP=\
+NODEP_CPP_SCRIPT=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7278,6 +6732,8 @@ NODEP_CPP_SCRIP=\
 	"..\..\..\scumm\common\str.h"\
 	"..\..\..\scumm\common\timer.h"\
 	"..\..\..\scumm\common\util.h"\
+	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
 	
 
@@ -7290,7 +6746,7 @@ SOURCE=..\..\..\scumm\script_v5.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCRIPT=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
@@ -7314,17 +6770,17 @@ DEP_CPP_SCRIPT=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCRIPT=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
@@ -7334,7 +6790,7 @@ DEP_CPP_SCRIPT=\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7350,7 +6806,7 @@ NODEP_CPP_SCRIPT=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
@@ -7374,17 +6830,17 @@ DEP_CPP_SCRIPT=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
@@ -7394,7 +6850,7 @@ DEP_CPP_SCRIPT=\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7410,7 +6866,7 @@ NODEP_CPP_SCRIPT=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
@@ -7434,15 +6890,17 @@ DEP_CPP_SCRIPT=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCRIPT=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
@@ -7466,17 +6924,22 @@ DEP_CPP_SCRIPT=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_SCRIPT=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
@@ -7486,7 +6949,7 @@ DEP_CPP_SCRIPT=\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7502,7 +6965,7 @@ NODEP_CPP_SCRIPT=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_SCRIPT=\
+DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
@@ -7512,7 +6975,7 @@ DEP_CPP_SCRIPT=\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT=\
+NODEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7535,7 +6998,7 @@ SOURCE=..\..\..\scumm\script_v6.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCRIPT_=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
@@ -7560,36 +7023,36 @@ DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCRIPT_=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
@@ -7599,23 +7062,13 @@ DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT_=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7626,8 +7079,18 @@ NODEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\common\util.h"\
 	"..\..\..\scumm\gui\dialog.h"\
 	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
 	"..\..\..\scumm\smush\common\rect.h"\
 	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound\mididrv.h"\
 	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
@@ -7635,7 +7098,7 @@ NODEP_CPP_SCRIPT_=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT_=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
@@ -7660,36 +7123,36 @@ DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT_=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
@@ -7699,23 +7162,13 @@ DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT_=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7726,8 +7179,18 @@ NODEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\common\util.h"\
 	"..\..\..\scumm\gui\dialog.h"\
 	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
 	"..\..\..\scumm\smush\common\rect.h"\
 	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound\mididrv.h"\
 	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
@@ -7735,13 +7198,12 @@ NODEP_CPP_SCRIPT_=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -7757,43 +7219,34 @@ DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\dialogs.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
+	"..\..\..\scumm\smush\smush_player.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCRIPT_=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -7809,39 +7262,34 @@ DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\dialogs.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
+	"..\..\..\scumm\smush\smush_player.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_SCRIPT_=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
@@ -7851,23 +7299,13 @@ DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
-	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
-	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
+	"..\..\..\scumm\smush\codec37.h"\
+	"..\..\..\scumm\smush\codec47.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT_=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7878,8 +7316,18 @@ NODEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\common\util.h"\
 	"..\..\..\scumm\gui\dialog.h"\
 	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
 	"..\..\..\scumm\smush\common\rect.h"\
 	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound\mididrv.h"\
 	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
@@ -7887,7 +7335,7 @@ NODEP_CPP_SCRIPT_=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_SCRIPT_=\
+DEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
@@ -7897,23 +7345,13 @@ DEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT_=\
+NODEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -7924,8 +7362,18 @@ NODEP_CPP_SCRIPT_=\
 	"..\..\..\scumm\common\util.h"\
 	"..\..\..\scumm\gui\dialog.h"\
 	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
 	"..\..\..\scumm\smush\common\rect.h"\
 	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound\mididrv.h"\
 	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
@@ -7940,7 +7388,7 @@ SOURCE=..\..\..\scumm\script_v8.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
@@ -7960,58 +7408,48 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -8021,15 +7459,25 @@ NODEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\common\timer.h"\
 	"..\..\..\scumm\common\util.h"\
 	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
 	"..\..\..\scumm\smush\common\rect.h"\
 	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
@@ -8049,58 +7497,48 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -8110,21 +7548,30 @@ NODEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\common\timer.h"\
 	"..\..\..\scumm\common\util.h"\
 	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
 	"..\..\..\scumm\smush\common\rect.h"\
 	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -8138,39 +7585,31 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
+	"..\..\..\scumm\smush\smush_player.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
@@ -8184,58 +7623,44 @@ DEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
+	"..\..\..\scumm\smush\smush_player.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -8245,38 +7670,38 @@ NODEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\common\timer.h"\
 	"..\..\..\scumm\common\util.h"\
 	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
 	"..\..\..\scumm\smush\common\rect.h"\
 	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_SCRIPT_V=\
+DEP_CPP_SCRIPT_V8=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\smush\brenderer.h"\
 	"..\..\..\scumm\smush\chunk.h"\
-	"..\..\..\scumm\smush\codec1.h"\
 	"..\..\..\scumm\smush\codec37.h"\
-	"..\..\..\scumm\smush\codec44.h"\
 	"..\..\..\scumm\smush\codec47.h"\
-	"..\..\..\scumm\smush\color.h"\
-	"..\..\..\scumm\smush\config.h"\
-	"..\..\..\scumm\smush\decoder.h"\
-	"..\..\..\scumm\smush\palette.h"\
-	"..\..\..\scumm\smush\player.h"\
-	"..\..\..\scumm\smush\renderer.h"\
-	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCRIPT_V=\
+NODEP_CPP_SCRIPT_V8=\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
 	"..\..\..\scumm\common\gameDetector.h"\
@@ -8286,8 +7711,18 @@ NODEP_CPP_SCRIPT_V=\
 	"..\..\..\scumm\common\timer.h"\
 	"..\..\..\scumm\common\util.h"\
 	"..\..\..\scumm\scummsys.h"\
+	"..\..\..\scumm\smush\brenderer.h"\
+	"..\..\..\scumm\smush\codec1.h"\
+	"..\..\..\scumm\smush\codec44.h"\
+	"..\..\..\scumm\smush\color.h"\
 	"..\..\..\scumm\smush\common\rect.h"\
 	"..\..\..\scumm\smush\common\util.h"\
+	"..\..\..\scumm\smush\config.h"\
+	"..\..\..\scumm\smush\decoder.h"\
+	"..\..\..\scumm\smush\palette.h"\
+	"..\..\..\scumm\smush\player.h"\
+	"..\..\..\scumm\smush\renderer.h"\
+	"..\..\..\scumm\smush\scumm_renderer.h"\
 	"..\..\..\scumm\sound\mixer.h"\
 	"..\..\..\scumm\stdafx.h"\
 	
@@ -8305,7 +7740,7 @@ SOURCE=..\..\..\scumm\scummvm.cpp
 
 !IF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCUMMV=\
+DEP_CPP_SCUMM=\
 	"..\..\..\common\config-file.h"\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
@@ -8343,17 +7778,17 @@ DEP_CPP_SCUMMV=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCUMMV=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCUMMV=\
+DEP_CPP_SCUMM=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\bundle.h"\
@@ -8370,7 +7805,7 @@ DEP_CPP_SCUMMV=\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCUMMV=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\scumm\common\config-file.h"\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
@@ -8393,7 +7828,7 @@ NODEP_CPP_SCUMMV=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCUMMV=\
+DEP_CPP_SCUMM=\
 	"..\..\..\common\config-file.h"\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
@@ -8431,17 +7866,17 @@ DEP_CPP_SCUMMV=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCUMMV=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCUMMV=\
+DEP_CPP_SCUMM=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\bundle.h"\
@@ -8458,7 +7893,7 @@ DEP_CPP_SCUMMV=\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCUMMV=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\scumm\common\config-file.h"\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
@@ -8481,7 +7916,7 @@ NODEP_CPP_SCUMMV=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCUMMV=\
+DEP_CPP_SCUMM=\
 	"..\..\..\common\config-file.h"\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
@@ -8519,15 +7954,17 @@ DEP_CPP_SCUMMV=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCUMMV=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCUMMV=\
+DEP_CPP_SCUMM=\
 	"..\..\..\common\config-file.h"\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
@@ -8565,17 +8002,22 @@ DEP_CPP_SCUMMV=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_SCUMMV=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
 
-DEP_CPP_SCUMMV=\
+DEP_CPP_SCUMM=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\bundle.h"\
@@ -8592,7 +8034,7 @@ DEP_CPP_SCUMMV=\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCUMMV=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\scumm\common\config-file.h"\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
@@ -8615,7 +8057,7 @@ NODEP_CPP_SCUMMV=\
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Debug"
 
-DEP_CPP_SCUMMV=\
+DEP_CPP_SCUMM=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\bundle.h"\
@@ -8632,7 +8074,7 @@ DEP_CPP_SCUMMV=\
 	"..\..\..\scumm\sound.h"\
 	"..\..\..\scumm\verbs.h"\
 	
-NODEP_CPP_SCUMMV=\
+NODEP_CPP_SCUMM=\
 	"..\..\..\scumm\common\config-file.h"\
 	"..\..\..\scumm\common\engine.h"\
 	"..\..\..\scumm\common\file.h"\
@@ -8688,12 +8130,12 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -8753,12 +8195,12 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -8818,6 +8260,8 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\macos.h"\
@@ -8852,12 +8296,17 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -8957,12 +8406,12 @@ DEP_CPP_STRIN=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -9019,12 +8468,12 @@ DEP_CPP_STRIN=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -9081,6 +8530,8 @@ DEP_CPP_STRIN=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\..\common\macos.h"\
@@ -9115,12 +8566,17 @@ DEP_CPP_STRIN=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STRIN=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
+	".\orbis\config_types.h"\
+	".\orbis\ivorbiscodec.h"\
+	".\orbis\ogg.h"\
+	".\orbis\os_types.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -9203,11 +8659,11 @@ DEP_CPP_USAGE=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -9250,11 +8706,11 @@ DEP_CPP_USAGE=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -9297,6 +8753,7 @@ DEP_CPP_USAGE=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\..\common\macos.h"\
@@ -9324,11 +8781,11 @@ DEP_CPP_USAGE=\
 	"..\..\..\scumm\usage_bits.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_USAGE=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -9401,11 +8858,11 @@ DEP_CPP_VARS_=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -9448,11 +8905,11 @@ DEP_CPP_VARS_=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -9495,6 +8952,7 @@ DEP_CPP_VARS_=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\..\common\macos.h"\
@@ -9522,11 +8980,11 @@ DEP_CPP_VARS_=\
 	"..\..\..\scumm\scumm.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VARS_=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
@@ -9598,11 +9056,11 @@ DEP_CPP_VERBS=\
 	"..\..\..\scumm\verbs.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE MIPS) Debug"
@@ -9653,11 +9111,11 @@ DEP_CPP_VERBS=\
 	"..\..\..\scumm\verbs.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE SH3) Debug"
@@ -9708,6 +9166,7 @@ DEP_CPP_VERBS=\
 	"..\..\..\scumm\verbs.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\..\common\macos.h"\
@@ -9738,11 +9197,11 @@ DEP_CPP_VERBS=\
 	"..\..\..\scumm\verbs.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERBS=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scumm - Win32 (WCE x86em) Release"
diff --git a/backends/wince/scummvm/scummvm.vcp b/backends/wince/scummvm/scummvm.vcp
index 9bf0879fbf..c75387fdb2 100644
--- a/backends/wince/scummvm/scummvm.vcp
+++ b/backends/wince/scummvm/scummvm.vcp
@@ -58,7 +58,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r
 CPP=clmips.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /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
@@ -91,7 +91,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r
 CPP=clmips.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NONSTANDARD_PORT" /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
@@ -124,7 +124,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
 CPP=shcl.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /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" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /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" /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
@@ -157,7 +157,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r
 CPP=shcl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NONSTANDARD_PORT" /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
@@ -192,7 +192,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /O2 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /FR /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /O2 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "USE_VORBIS" /D "NONSTANDARD_PORT" /FR /YX /Oxs /M$(CECrtMT) /c
 # SUBTRACT CPP /X
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -202,10 +202,10 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 coredll.lib mad.lib SDLAudio.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /out:"ARMRel/PocketScumm.exe" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 coredll.lib mad.lib SDLAudio.lib LibTremorCE.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /out:"ARMRel/PocketScumm.exe" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=
+PostBuild_Cmds=h:\smartphone\spvprov\authenticode\signcode -v h:\smartphone\spvprov\cert\SPVcert.key -spc h:\smartphone\spvprov\cert\SPVcert.spc armrel\PocketScumm.exe
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -232,7 +232,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /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 "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "_LIB" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "_LIB" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "USE_VORBIS" /D "NONSTANDARD_PORT" /D "USE_WINDBG" /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
@@ -241,10 +241,10 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib mad.lib SDLAudio.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"ARMDbg/PocketSCUMM.exe" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib mad.lib SDLAudio.lib LibTremorCE.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /out:"ARMDbg/PocketSCUMM.exe" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=
+PostBuild_Cmds=h:\smartphone\spvprov\authenticode\signcode -v h:\smartphone\spvprov\cert\SPVcert.key -spc h:\smartphone\spvprov\cert\SPVcert.spc armdbg\PocketScumm.exe
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
@@ -428,10 +428,11 @@ DEP_CPP_CONFI=\
 	"..\..\..\common\util.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONFI=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -452,6 +453,7 @@ DEP_CPP_CONFI=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONFI=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -618,12 +620,18 @@ DEP_CPP_ENGIN=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ENGIN=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -646,8 +654,14 @@ DEP_CPP_ENGIN=\
 	"..\portdefs.h"\
 	{$(INCLUDE)}"mad.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ENGIN=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
@@ -782,10 +796,11 @@ DEP_CPP_FILE_=\
 	"..\..\..\common\system.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FILE_=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -802,6 +817,7 @@ DEP_CPP_FILE_=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FILE_=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -929,20 +945,20 @@ DEP_CPP_GAMED=\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GAMED=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -954,19 +970,19 @@ DEP_CPP_GAMED=\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scumm\imuse.h"\
-	"..\..\..\scumm\imuse_digi.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GAMED=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -1083,10 +1099,11 @@ DEP_CPP_SCALE=\
 	"..\..\..\common\stdafx.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCALE=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -1100,6 +1117,7 @@ DEP_CPP_SCALE=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCALE=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -1138,69 +1156,6 @@ SOURCE=..\..\..\common\scummsys.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\stdafx.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-DEP_CPP_STDAF=\
-	"..\..\..\common\stdafx.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_STDAF=\
-	"..\..\..\common\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_STDAF=\
-	"..\..\..\common\stdafx.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_STDAF=\
-	"..\..\..\common\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-DEP_CPP_STDAF=\
-	"..\..\..\common\stdafx.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_STDAF=\
-	"..\..\..\common\stdafx.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
-
-DEP_CPP_STDAF=\
-	"..\..\..\common\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Debug"
-
-DEP_CPP_STDAF=\
-	"..\..\..\common\stdafx.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\common\stdafx.h
 # End Source File
 # Begin Source File
@@ -1272,10 +1227,11 @@ DEP_CPP_STR_C=\
 	"..\..\..\common\str.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STR_C=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -1290,6 +1246,7 @@ DEP_CPP_STR_C=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STR_C=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -1411,11 +1368,12 @@ DEP_CPP_TIMER=\
 	"..\..\..\common\timer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TIMER=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -1432,6 +1390,7 @@ DEP_CPP_TIMER=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TIMER=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
@@ -1615,10 +1574,11 @@ DEP_CPP_FMOPL=\
 	"..\..\..\sound\fmopl.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FMOPL=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -1635,6 +1595,7 @@ DEP_CPP_FMOPL=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FMOPL=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -1748,10 +1709,11 @@ DEP_CPP_MIDID=\
 	"..\..\..\sound\mpu401.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDID=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -1770,6 +1732,7 @@ DEP_CPP_MIDID=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDID=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -1865,10 +1828,11 @@ DEP_CPP_MIDIS=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midistreamer.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIS=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -1881,6 +1845,7 @@ DEP_CPP_MIDIS=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIS=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -1995,11 +1960,17 @@ DEP_CPP_MIXER=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MIXER=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -2016,8 +1987,14 @@ DEP_CPP_MIXER=\
 	"..\portdefs.h"\
 	{$(INCLUDE)}"mad.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MIXER=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -2135,10 +2112,11 @@ DEP_CPP_MPU40=\
 	"..\..\..\sound\mpu401.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MPU40=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -2157,6 +2135,7 @@ DEP_CPP_MPU40=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MPU40=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -2289,10 +2268,11 @@ DEP_CPP_BROWS=\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\widget.h"\
 	"..\..\fs\fs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BROWS=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -2312,6 +2292,7 @@ DEP_CPP_BROWS=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BROWS=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -2443,10 +2424,11 @@ DEP_CPP_CHOOS=\
 	"..\..\..\gui\ListWidget.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHOOS=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -2465,6 +2447,7 @@ DEP_CPP_CHOOS=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHOOS=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -2608,10 +2591,11 @@ DEP_CPP_CONSO=\
 	"..\..\..\gui\widget.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONSO=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -2634,6 +2618,7 @@ DEP_CPP_CONSO=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONSO=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -2764,10 +2749,11 @@ DEP_CPP_DIALO=\
 	"..\..\..\gui\widget.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -2787,6 +2773,7 @@ DEP_CPP_DIALO=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -2918,10 +2905,11 @@ DEP_CPP_EDITT=\
 	"..\..\..\gui\widget.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_EDITT=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -2942,6 +2930,7 @@ DEP_CPP_EDITT=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_EDITT=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -3133,10 +3122,11 @@ DEP_CPP_LAUNC=\
 	"..\..\fs\fs.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_LAUNC=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -3169,6 +3159,7 @@ DEP_CPP_LAUNC=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_LAUNC=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -3329,10 +3320,11 @@ DEP_CPP_LISTW=\
 	"..\..\..\gui\widget.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_LISTW=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -3354,6 +3346,7 @@ DEP_CPP_LISTW=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_LISTW=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -3491,10 +3484,11 @@ DEP_CPP_MESSA=\
 	"..\..\..\gui\widget.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MESSA=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -3515,6 +3509,7 @@ DEP_CPP_MESSA=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MESSA=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -3643,10 +3638,12 @@ DEP_CPP_NEWGU=\
 	"..\..\..\gui\widget.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
+	"..\..\..\gui\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -3666,7 +3663,9 @@ DEP_CPP_NEWGU=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
+	"..\..\..\gui\scumm_globals.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
@@ -3826,12 +3825,14 @@ DEP_CPP_OPTIO=\
 	"..\..\..\gui\options.h"\
 	"..\..\..\gui\PopUpWidget.h"\
 	"..\..\..\gui\widget.h"\
+	"..\..\fs\fs.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OPTIO=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -3854,11 +3855,13 @@ DEP_CPP_OPTIO=\
 	"..\..\..\gui\options.h"\
 	"..\..\..\gui\PopUpWidget.h"\
 	"..\..\..\gui\widget.h"\
+	"..\..\fs\fs.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OPTIO=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -4009,10 +4012,11 @@ DEP_CPP_POPUP=\
 	"..\..\..\gui\widget.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_POPUP=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -4034,6 +4038,7 @@ DEP_CPP_POPUP=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_POPUP=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -4169,10 +4174,11 @@ DEP_CPP_SCROL=\
 	"..\..\..\gui\widget.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -4193,6 +4199,7 @@ DEP_CPP_SCROL=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -4319,10 +4326,11 @@ DEP_CPP_WIDGE=\
 	"..\..\..\gui\widget.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -4342,6 +4350,7 @@ DEP_CPP_WIDGE=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -4590,6 +4599,7 @@ DEP_CPP_FINDG=\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
@@ -4629,6 +4639,7 @@ DEP_CPP_FINDG=\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
@@ -4681,11 +4692,12 @@ DEP_CPP_FINDG=\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
 	"..\screen.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FINDG=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -4713,6 +4725,7 @@ DEP_CPP_FINDG=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FINDG=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
@@ -4811,10 +4824,8 @@ DEP_CPP_GAPI_=\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
 	"..\screen.h"\
-	
-NODEP_CPP_GAPI_=\
-	".\ipapi.h"\
-	".\x.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -4911,8 +4922,8 @@ DEP_CPP_POCKE=\
 NODEP_CPP_POCKE=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
-	"..\GameX.h"\
 	".\ad.h"\
+	".\ameX.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -4955,12 +4966,12 @@ NODEP_CPP_POCKE=\
 	"..\config-file.h"\
 	"..\debug.h"\
 	"..\gameDetector.h"\
-	"..\GameX.h"\
 	"..\gui\newgui.h"\
 	"..\scumm.h"\
 	"..\simon\simon.h"\
 	"..\sound\mididrv.h"\
 	"..\stdafx.h"\
+	".\ameX.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -5141,37 +5152,43 @@ DEP_CPP_POCKE=\
 	"..\screen.h"\
 	"..\smartphone.h"\
 	"..\wince.h"\
+	{$(INCLUDE)}"begin_code.h"\
+	{$(INCLUDE)}"close_code.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL.h"\
+	{$(INCLUDE)}"SDL_active.h"\
+	{$(INCLUDE)}"SDL_audio.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"SDL_cdrom.h"\
+	{$(INCLUDE)}"SDL_error.h"\
+	{$(INCLUDE)}"SDL_events.h"\
+	{$(INCLUDE)}"SDL_getenv.h"\
+	{$(INCLUDE)}"SDL_joystick.h"\
+	{$(INCLUDE)}"SDL_keyboard.h"\
+	{$(INCLUDE)}"SDL_keysym.h"\
+	{$(INCLUDE)}"SDL_main.h"\
+	{$(INCLUDE)}"SDL_mouse.h"\
+	{$(INCLUDE)}"SDL_mutex.h"\
+	{$(INCLUDE)}"SDL_quit.h"\
+	{$(INCLUDE)}"SDL_rwops.h"\
+	{$(INCLUDE)}"SDL_thread.h"\
+	{$(INCLUDE)}"SDL_timer.h"\
+	{$(INCLUDE)}"SDL_types.h"\
+	{$(INCLUDE)}"SDL_version.h"\
+	{$(INCLUDE)}"SDL_video.h"\
+	{$(INCLUDE)}"sipapi.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_POCKE=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\GameX.h"\
-	".\ad.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_thread.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\ipapi.h"\
-	".\lose_code.h"\
-	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -5236,8 +5253,14 @@ DEP_CPP_POCKE=\
 	{$(INCLUDE)}"SDL_version.h"\
 	{$(INCLUDE)}"SDL_video.h"\
 	{$(INCLUDE)}"sipapi.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_POCKE=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\GameX.h"\
@@ -5316,50 +5339,6 @@ SOURCE=..\screen.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCREE=\
-	"..\dynamic_imports.h"\
-	"..\screen.h"\
-	
-NODEP_CPP_SCREE=\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_SCREE=\
-	"..\dynamic_imports.h"\
-	"..\screen.h"\
-	
-NODEP_CPP_SCREE=\
-	"..\gx.h"\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_SCREE=\
-	"..\dynamic_imports.h"\
-	"..\screen.h"\
-	
-NODEP_CPP_SCREE=\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_SCREE=\
-	"..\dynamic_imports.h"\
-	"..\screen.h"\
-	
-NODEP_CPP_SCREE=\
-	"..\gx.h"\
-	".\ipapi.h"\
-	".\ygshell.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
 DEP_CPP_SCREE=\
 	"..\..\..\common\config-file.h"\
 	"..\..\..\common\engine.h"\
@@ -5398,8 +5377,8 @@ DEP_CPP_SCREE=\
 NODEP_CPP_SCREE=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
-	"..\GameX.h"\
 	".\ad.h"\
+	".\ameX.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -5427,46 +5406,211 @@ NODEP_CPP_SCREE=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SCREE=\
-	"..\..\..\common\config-file.h"\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\gameDetector.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\scumm\boxes.h"\
-	"..\..\..\scumm\debug.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\simon\intern.h"\
-	"..\..\..\simon\midi.h"\
-	"..\..\..\simon\simon.h"\
-	"..\..\..\simon\sound.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\fs\fs.h"\
 	"..\dynamic_imports.h"\
 	"..\gapi_keys.h"\
-	"..\missing\unistd.h"\
 	"..\pocketpc.h"\
-	"..\portdefs.h"\
 	"..\screen.h"\
 	"..\smartphone.h"\
 	"..\wince.h"\
-	{$(INCLUDE)}"begin_code.h"\
-	{$(INCLUDE)}"close_code.h"\
-	{$(INCLUDE)}"gx.h"\
-	{$(INCLUDE)}"mad.h"\
+	
+NODEP_CPP_SCREE=\
+	"..\backends\fs\fs.h"\
+	"..\config-file.h"\
+	"..\debug.h"\
+	"..\gameDetector.h"\
+	"..\gui\newgui.h"\
+	"..\scumm.h"\
+	"..\simon\simon.h"\
+	"..\sound\mididrv.h"\
+	"..\stdafx.h"\
+	".\ameX.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_thread.h"\
+	".\DL_timer.h"\
+	".\DL_types.h"\
+	".\DL_version.h"\
+	".\DL_video.h"\
+	".\egin_code.h"\
+	".\ipapi.h"\
+	".\lose_code.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+DEP_CPP_SCREE=\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\debug.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\simon\intern.h"\
+	"..\..\..\simon\midi.h"\
+	"..\..\..\simon\simon.h"\
+	"..\..\..\simon\sound.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\fs\fs.h"\
+	"..\dynamic_imports.h"\
+	"..\gapi_keys.h"\
+	"..\missing\unistd.h"\
+	"..\pocketpc.h"\
+	"..\portdefs.h"\
+	"..\screen.h"\
+	"..\smartphone.h"\
+	"..\wince.h"\
+	
+NODEP_CPP_SCREE=\
+	"..\..\..\common\macos.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\GameX.h"\
+	".\ad.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_thread.h"\
+	".\DL_timer.h"\
+	".\DL_types.h"\
+	".\DL_version.h"\
+	".\DL_video.h"\
+	".\egin_code.h"\
+	".\ipapi.h"\
+	".\lose_code.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SCREE=\
+	"..\dynamic_imports.h"\
+	"..\gapi_keys.h"\
+	"..\pocketpc.h"\
+	"..\screen.h"\
+	"..\smartphone.h"\
+	"..\wince.h"\
+	
+NODEP_CPP_SCREE=\
+	"..\backends\fs\fs.h"\
+	"..\config-file.h"\
+	"..\debug.h"\
+	"..\gameDetector.h"\
+	"..\GameX.h"\
+	"..\gui\newgui.h"\
+	"..\scumm.h"\
+	"..\simon\simon.h"\
+	"..\sound\mididrv.h"\
+	"..\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_thread.h"\
+	".\DL_timer.h"\
+	".\DL_types.h"\
+	".\DL_version.h"\
+	".\DL_video.h"\
+	".\egin_code.h"\
+	".\ipapi.h"\
+	".\lose_code.h"\
+	".\x.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+DEP_CPP_SCREE=\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\debug.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\simon\intern.h"\
+	"..\..\..\simon\midi.h"\
+	"..\..\..\simon\simon.h"\
+	"..\..\..\simon\sound.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\fs\fs.h"\
+	"..\dynamic_imports.h"\
+	"..\gapi_keys.h"\
+	"..\missing\unistd.h"\
+	"..\pocketpc.h"\
+	"..\portdefs.h"\
+	"..\screen.h"\
+	"..\smartphone.h"\
+	"..\wince.h"\
+	{$(INCLUDE)}"begin_code.h"\
+	{$(INCLUDE)}"close_code.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"mad.h"\
 	{$(INCLUDE)}"SDL.h"\
 	{$(INCLUDE)}"SDL_active.h"\
 	{$(INCLUDE)}"SDL_audio.h"\
@@ -5489,8 +5633,89 @@ DEP_CPP_SCREE=\
 	{$(INCLUDE)}"SDL_version.h"\
 	{$(INCLUDE)}"SDL_video.h"\
 	{$(INCLUDE)}"sipapi.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCREE=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\macos.h"\
+	"..\..\..\common\morphos_timer.h"\
+	"..\GameX.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCREE=\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\engine.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\gameDetector.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\debug.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\simon\intern.h"\
+	"..\..\..\simon\midi.h"\
+	"..\..\..\simon\simon.h"\
+	"..\..\..\simon\sound.h"\
+	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\fs\fs.h"\
+	"..\dynamic_imports.h"\
+	"..\gapi_keys.h"\
+	"..\missing\unistd.h"\
+	"..\pocketpc.h"\
+	"..\portdefs.h"\
+	"..\screen.h"\
+	"..\smartphone.h"\
+	"..\wince.h"\
+	{$(INCLUDE)}"begin_code.h"\
+	{$(INCLUDE)}"close_code.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL.h"\
+	{$(INCLUDE)}"SDL_active.h"\
+	{$(INCLUDE)}"SDL_audio.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"SDL_cdrom.h"\
+	{$(INCLUDE)}"SDL_error.h"\
+	{$(INCLUDE)}"SDL_events.h"\
+	{$(INCLUDE)}"SDL_getenv.h"\
+	{$(INCLUDE)}"SDL_joystick.h"\
+	{$(INCLUDE)}"SDL_keyboard.h"\
+	{$(INCLUDE)}"SDL_keysym.h"\
+	{$(INCLUDE)}"SDL_main.h"\
+	{$(INCLUDE)}"SDL_mouse.h"\
+	{$(INCLUDE)}"SDL_mutex.h"\
+	{$(INCLUDE)}"SDL_quit.h"\
+	{$(INCLUDE)}"SDL_rwops.h"\
+	{$(INCLUDE)}"SDL_thread.h"\
+	{$(INCLUDE)}"SDL_timer.h"\
+	{$(INCLUDE)}"SDL_types.h"\
+	{$(INCLUDE)}"SDL_version.h"\
+	{$(INCLUDE)}"SDL_video.h"\
+	{$(INCLUDE)}"sipapi.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
+	
+NODEP_CPP_SCREE=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\GameX.h"\
@@ -5500,24 +5725,56 @@ NODEP_CPP_SCREE=\
 
 DEP_CPP_SCREE=\
 	"..\dynamic_imports.h"\
+	"..\gapi_keys.h"\
+	"..\pocketpc.h"\
 	"..\screen.h"\
+	"..\smartphone.h"\
+	"..\wince.h"\
 	
 NODEP_CPP_SCREE=\
-	"..\gx.h"\
+	"..\backends\fs\fs.h"\
+	"..\config-file.h"\
+	"..\debug.h"\
+	"..\gameDetector.h"\
+	"..\GameX.h"\
+	"..\gui\newgui.h"\
+	"..\scumm.h"\
+	"..\SDL.h"\
+	"..\SDL_audio.h"\
+	"..\SDL_thread.h"\
+	"..\SDL_timer.h"\
+	"..\simon\simon.h"\
+	"..\sound\mididrv.h"\
+	"..\stdafx.h"\
 	".\ipapi.h"\
-	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Debug"
 
 DEP_CPP_SCREE=\
 	"..\dynamic_imports.h"\
+	"..\gapi_keys.h"\
+	"..\pocketpc.h"\
 	"..\screen.h"\
+	"..\smartphone.h"\
+	"..\wince.h"\
 	
 NODEP_CPP_SCREE=\
-	"..\gx.h"\
+	"..\backends\fs\fs.h"\
+	"..\config-file.h"\
+	"..\debug.h"\
+	"..\gameDetector.h"\
+	"..\GameX.h"\
+	"..\gui\newgui.h"\
+	"..\scumm.h"\
+	"..\SDL.h"\
+	"..\SDL_audio.h"\
+	"..\SDL_thread.h"\
+	"..\SDL_timer.h"\
+	"..\simon\simon.h"\
+	"..\sound\mididrv.h"\
+	"..\stdafx.h"\
 	".\ipapi.h"\
-	".\ygshell.h"\
 	
 
 !ENDIF 
@@ -5571,8 +5828,8 @@ DEP_CPP_SMART=\
 NODEP_CPP_SMART=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
-	"..\GameX.h"\
 	".\ad.h"\
+	".\ameX.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -5598,6 +5855,7 @@ NODEP_CPP_SMART=\
 	".\ipapi.h"\
 	".\lose_code.h"\
 	".\x.h"\
+	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
@@ -5615,12 +5873,12 @@ NODEP_CPP_SMART=\
 	"..\config-file.h"\
 	"..\debug.h"\
 	"..\gameDetector.h"\
-	"..\GameX.h"\
 	"..\gui\newgui.h"\
 	"..\scumm.h"\
 	"..\simon\simon.h"\
 	"..\sound\mididrv.h"\
 	"..\stdafx.h"\
+	".\ameX.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -5646,6 +5904,7 @@ NODEP_CPP_SMART=\
 	".\ipapi.h"\
 	".\lose_code.h"\
 	".\x.h"\
+	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
@@ -5715,6 +5974,7 @@ NODEP_CPP_SMART=\
 	".\ipapi.h"\
 	".\lose_code.h"\
 	".\x.h"\
+	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
@@ -5763,6 +6023,7 @@ NODEP_CPP_SMART=\
 	".\ipapi.h"\
 	".\lose_code.h"\
 	".\x.h"\
+	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
@@ -5801,37 +6062,45 @@ DEP_CPP_SMART=\
 	"..\screen.h"\
 	"..\smartphone.h"\
 	"..\wince.h"\
+	{$(INCLUDE)}"Aygshell.h"\
+	{$(INCLUDE)}"begin_code.h"\
+	{$(INCLUDE)}"close_code.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL.h"\
+	{$(INCLUDE)}"SDL_active.h"\
+	{$(INCLUDE)}"SDL_audio.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"SDL_cdrom.h"\
+	{$(INCLUDE)}"SDL_error.h"\
+	{$(INCLUDE)}"SDL_events.h"\
+	{$(INCLUDE)}"SDL_getenv.h"\
+	{$(INCLUDE)}"SDL_joystick.h"\
+	{$(INCLUDE)}"SDL_keyboard.h"\
+	{$(INCLUDE)}"SDL_keysym.h"\
+	{$(INCLUDE)}"SDL_main.h"\
+	{$(INCLUDE)}"SDL_mouse.h"\
+	{$(INCLUDE)}"SDL_mutex.h"\
+	{$(INCLUDE)}"SDL_quit.h"\
+	{$(INCLUDE)}"SDL_rwops.h"\
+	{$(INCLUDE)}"SDL_thread.h"\
+	{$(INCLUDE)}"SDL_timer.h"\
+	{$(INCLUDE)}"SDL_types.h"\
+	{$(INCLUDE)}"SDL_version.h"\
+	{$(INCLUDE)}"SDL_video.h"\
+	{$(INCLUDE)}"sipapi.h"\
+	{$(INCLUDE)}"vibrate.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMART=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\GameX.h"\
-	".\ad.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_thread.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\ipapi.h"\
-	".\lose_code.h"\
-	".\x.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -5870,7 +6139,7 @@ DEP_CPP_SMART=\
 	"..\screen.h"\
 	"..\smartphone.h"\
 	"..\wince.h"\
-	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"Aygshell.h"\
 	{$(INCLUDE)}"begin_code.h"\
 	{$(INCLUDE)}"close_code.h"\
 	{$(INCLUDE)}"gx.h"\
@@ -5898,8 +6167,14 @@ DEP_CPP_SMART=\
 	{$(INCLUDE)}"SDL_video.h"\
 	{$(INCLUDE)}"sipapi.h"\
 	{$(INCLUDE)}"vibrate.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SMART=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\GameX.h"\
@@ -5931,6 +6206,7 @@ NODEP_CPP_SMART=\
 	"..\sound\mididrv.h"\
 	"..\stdafx.h"\
 	".\ipapi.h"\
+	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Debug"
@@ -5959,6 +6235,7 @@ NODEP_CPP_SMART=\
 	"..\sound\mididrv.h"\
 	"..\stdafx.h"\
 	".\ipapi.h"\
+	".\ygshell.h"\
 	
 
 !ENDIF 
@@ -6012,8 +6289,8 @@ DEP_CPP_WINCE=\
 NODEP_CPP_WINCE=\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
-	"..\GameX.h"\
 	".\ad.h"\
+	".\ameX.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -6246,39 +6523,45 @@ DEP_CPP_WINCE=\
 	"..\screen.h"\
 	"..\smartphone.h"\
 	"..\wince.h"\
+	{$(INCLUDE)}"Aygshell.h"\
+	{$(INCLUDE)}"begin_code.h"\
+	{$(INCLUDE)}"close_code.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL.h"\
+	{$(INCLUDE)}"SDL_active.h"\
+	{$(INCLUDE)}"SDL_audio.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"SDL_cdrom.h"\
+	{$(INCLUDE)}"SDL_error.h"\
+	{$(INCLUDE)}"SDL_events.h"\
+	{$(INCLUDE)}"SDL_getenv.h"\
+	{$(INCLUDE)}"SDL_joystick.h"\
+	{$(INCLUDE)}"SDL_keyboard.h"\
+	{$(INCLUDE)}"SDL_keysym.h"\
+	{$(INCLUDE)}"SDL_main.h"\
+	{$(INCLUDE)}"SDL_mouse.h"\
+	{$(INCLUDE)}"SDL_mutex.h"\
+	{$(INCLUDE)}"SDL_quit.h"\
+	{$(INCLUDE)}"SDL_rwops.h"\
+	{$(INCLUDE)}"SDL_thread.h"\
+	{$(INCLUDE)}"SDL_timer.h"\
+	{$(INCLUDE)}"SDL_types.h"\
+	{$(INCLUDE)}"SDL_version.h"\
+	{$(INCLUDE)}"SDL_video.h"\
+	{$(INCLUDE)}"sipapi.h"\
+	{$(INCLUDE)}"vibrate.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_WINCE=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\GameX.h"\
-	".\ad.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_thread.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\ibrate.h"\
-	".\ipapi.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	".\ygshell.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -6317,7 +6600,7 @@ DEP_CPP_WINCE=\
 	"..\screen.h"\
 	"..\smartphone.h"\
 	"..\wince.h"\
-	{$(INCLUDE)}"aygshell.h"\
+	{$(INCLUDE)}"Aygshell.h"\
 	{$(INCLUDE)}"begin_code.h"\
 	{$(INCLUDE)}"close_code.h"\
 	{$(INCLUDE)}"gx.h"\
@@ -6345,8 +6628,14 @@ DEP_CPP_WINCE=\
 	{$(INCLUDE)}"SDL_video.h"\
 	{$(INCLUDE)}"sipapi.h"\
 	{$(INCLUDE)}"vibrate.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_WINCE=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\GameX.h"\
@@ -6481,10 +6770,11 @@ DEP_CPP_WINDO=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\str.h"\
 	"..\..\fs\fs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WINDO=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -6497,6 +6787,7 @@ DEP_CPP_WINDO=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WINDO=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -6614,11 +6905,17 @@ DEP_CPP_ADLIB=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ADLIB=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -6637,8 +6934,14 @@ DEP_CPP_ADLIB=\
 	"..\portdefs.h"\
 	{$(INCLUDE)}"mad.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ADLIB=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -6735,10 +7038,11 @@ DEP_CPP_ALSA_=\
 	"..\..\..\sound\mpu401.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ALSA_=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -6756,6 +7060,7 @@ DEP_CPP_ALSA_=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ALSA_=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -6824,10 +7129,11 @@ DEP_CPP_COREA=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COREA=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -6839,6 +7145,7 @@ DEP_CPP_COREA=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COREA=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -6933,12 +7240,13 @@ DEP_CPP_MORPH=\
 	"..\..\..\sound\mpu401.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MORPH=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\midi\morphos.h"\
 	"..\..\midi\morphos_sound.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -6956,6 +7264,7 @@ DEP_CPP_MORPH=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MORPH=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\midi\morphos.h"\
 	"..\..\midi\morphos_sound.h"\
@@ -7052,10 +7361,11 @@ DEP_CPP_NULL_=\
 	"..\..\..\sound\mpu401.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NULL_=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -7073,6 +7383,7 @@ DEP_CPP_NULL_=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NULL_=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -7152,10 +7463,11 @@ DEP_CPP_QUICK=\
 	"..\..\..\common\system.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_QUICK=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -7170,6 +7482,7 @@ DEP_CPP_QUICK=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_QUICK=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -7258,10 +7571,11 @@ DEP_CPP_WINDOW=\
 	"..\..\..\sound\mpu401.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WINDOW=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -7279,6 +7593,7 @@ DEP_CPP_WINDOW=\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WINDOW=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	
 
@@ -7298,119 +7613,6 @@ NODEP_CPP_WINDOW=\
 	"..\..\midi\stdafx.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\midi\windowsce.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-DEP_CPP_WINDOWS=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-NODEP_CPP_WINDOWS=\
-	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-NODEP_CPP_WINDOWS=\
-	"..\..\midi\common\engine.h"\
-	"..\..\midi\sound\mpu401.h"\
-	"..\..\midi\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_WINDOWS=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-NODEP_CPP_WINDOWS=\
-	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-NODEP_CPP_WINDOWS=\
-	"..\..\midi\common\engine.h"\
-	"..\..\midi\sound\mpu401.h"\
-	"..\..\midi\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-DEP_CPP_WINDOWS=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	
-NODEP_CPP_WINDOWS=\
-	"..\..\..\common\macos.h"\
-	".\DL_byteorder.h"\
-	".\fmtmidi.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_WINDOWS=\
-	"..\..\..\common\engine.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	"..\missing\unistd.h"\
-	"..\portdefs.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"wfmtmidi.h"\
-	
-NODEP_CPP_WINDOWS=\
-	"..\..\..\common\macos.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Release"
-
-NODEP_CPP_WINDOWS=\
-	"..\..\midi\common\engine.h"\
-	"..\..\midi\sound\mpu401.h"\
-	"..\..\midi\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE x86em) Debug"
-
-NODEP_CPP_WINDOWS=\
-	"..\..\midi\common\engine.h"\
-	"..\..\midi\sound\mpu401.h"\
-	"..\..\midi\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -7427,19 +7629,25 @@ DEP_CPP_ACTOR=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\akos.h"\
+	"..\..\..\scumm\base-costume.h"\
 	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\costume.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\resource.h"\
 	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\usage_bits.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
@@ -7478,19 +7686,25 @@ DEP_CPP_ACTOR=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\akos.h"\
+	"..\..\..\scumm\base-costume.h"\
 	"..\..\..\scumm\boxes.h"\
+	"..\..\..\scumm\charset.h"\
 	"..\..\..\scumm\costume.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\resource.h"\
 	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\usage_bits.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
@@ -7551,12 +7765,18 @@ DEP_CPP_ACTOR=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ACTOR=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -7590,8 +7810,14 @@ DEP_CPP_ACTOR=\
 	"..\portdefs.h"\
 	{$(INCLUDE)}"mad.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ACTOR=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
@@ -7646,15 +7872,20 @@ SOURCE=..\..\..\scumm\scummvm.cpp
 !IF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SCUMM=\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\console.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
@@ -7662,14 +7893,18 @@ DEP_CPP_SCUMM=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\bundle.h"\
-	"..\..\..\scumm\debug.h"\
+	"..\..\..\scumm\charset.h"\
+	"..\..\..\scumm\debugger.h"\
 	"..\..\..\scumm\dialogs.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
+	"..\..\..\scumm\imuse_digi.h"\
+	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\object.h"\
 	"..\..\..\scumm\resource.h"\
 	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\verbs.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
@@ -7715,15 +7950,20 @@ NODEP_CPP_SCUMM=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 DEP_CPP_SCUMM=\
+	"..\..\..\common\config-file.h"\
 	"..\..\..\common\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\gameDetector.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\console.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
@@ -7731,14 +7971,18 @@ DEP_CPP_SCUMM=\
 	"..\..\..\scumm\actor.h"\
 	"..\..\..\scumm\boxes.h"\
 	"..\..\..\scumm\bundle.h"\
-	"..\..\..\scumm\debug.h"\
+	"..\..\..\scumm\charset.h"\
+	"..\..\..\scumm\debugger.h"\
 	"..\..\..\scumm\dialogs.h"\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\imuse.h"\
+	"..\..\..\scumm\imuse_digi.h"\
+	"..\..\..\scumm\intern.h"\
 	"..\..\..\scumm\object.h"\
 	"..\..\..\scumm\resource.h"\
 	"..\..\..\scumm\scumm.h"\
 	"..\..\..\scumm\sound.h"\
+	"..\..\..\scumm\verbs.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
@@ -7821,12 +8065,18 @@ DEP_CPP_SCUMM=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCUMM=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -7871,8 +8121,14 @@ DEP_CPP_SCUMM=\
 	"..\portdefs.h"\
 	{$(INCLUDE)}"mad.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_SCUMM=\
+	"..\..\..\common\extend.h"\
 	"..\..\..\common\macos.h"\
 	"..\..\..\common\morphos_timer.h"\
 	
@@ -7976,9 +8232,5 @@ SOURCE=..\PocketSCUMM.rc
 SOURCE=..\scumm_icon.ico
 # End Source File
 # End Group
-# Begin Source File
-
-SOURCE=.\portdefs.h
-# End Source File
 # End Target
 # End Project
diff --git a/backends/wince/simon/simon.vcp b/backends/wince/simon/simon.vcp
index 4f33fe6466..1df249e621 100644
--- a/backends/wince/simon/simon.vcp
+++ b/backends/wince/simon/simon.vcp
@@ -54,7 +54,7 @@ CFG=simon - Win32 (WCE MIPS) Debug
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "NONSTANDARD_PORT" /YX /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -106,7 +106,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -132,7 +132,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /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 "SHx" /D "SH3" /D "_SH3_" /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 "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "NONSTANDARD_PORT" /YX /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -158,7 +158,8 @@ 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" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /O2 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "_LIB" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /FR /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /W3 /O2 /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "_LIB" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /FR /YX /Oxs /M$(CECrtMT) /c
+# SUBTRACT CPP /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -184,7 +185,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "_LIB" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../" /I "../../.." /I "../../../common" /I "../../../scumm" /I "../missing" /D "_LIB" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /YX /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -281,11 +282,11 @@ DEP_CPP_DEBUG=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -316,11 +317,11 @@ DEP_CPP_DEBUG=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -376,11 +377,11 @@ DEP_CPP_DEBUG=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -434,11 +435,11 @@ DEP_CPP_ITEMS=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ITEMS=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -465,11 +466,11 @@ DEP_CPP_ITEMS=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ITEMS=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -519,11 +520,11 @@ DEP_CPP_ITEMS=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ITEMS=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -568,11 +569,11 @@ DEP_CPP_MIDI_=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDI_=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -606,11 +607,11 @@ DEP_CPP_MIDI_=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDI_=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -670,11 +671,11 @@ DEP_CPP_MIDI_=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDI_=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -729,11 +730,11 @@ DEP_CPP_RES_C=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RES_C=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -762,11 +763,11 @@ DEP_CPP_RES_C=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RES_C=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -819,11 +820,11 @@ DEP_CPP_RES_C=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RES_C=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -873,11 +874,11 @@ DEP_CPP_SIMON=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SIMON=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -914,11 +915,11 @@ DEP_CPP_SIMON=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SIMON=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -984,11 +985,11 @@ DEP_CPP_SIMON=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SIMON=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -1040,11 +1041,11 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -1070,11 +1071,11 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -1121,11 +1122,11 @@ DEP_CPP_SOUND=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -1173,11 +1174,11 @@ DEP_CPP_VERB_=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERB_=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -1204,11 +1205,11 @@ DEP_CPP_VERB_=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERB_=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -1258,11 +1259,11 @@ DEP_CPP_VERB_=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VERB_=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
@@ -1305,11 +1306,11 @@ DEP_CPP_VGA_C=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
@@ -1338,11 +1339,11 @@ DEP_CPP_VGA_C=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
@@ -1395,11 +1396,11 @@ DEP_CPP_VGA_C=\
 	"..\..\..\sound\mixer.h"\
 	"..\missing\unistd.h"\
 	"..\portdefs.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VGA_C=\
 	"..\..\..\common\macos.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "simon - Win32 (WCE x86em) Release"
-- 
cgit v1.2.3