Add queen

svn-id: r11848

1 files changed, 668 insertions, 253 deletions

diff --git a/dists/msevc4/scummvm/scummvm.vcp b/dists/msevc4/scummvm/scummvm.vcp
index 9ec3aa36cf..9466bedfab 100644
--- a/dists/msevc4/scummvm/scummvm.vcp
+++ b/dists/msevc4/scummvm/scummvm.vcp
@@ -116,7 +116,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "DISABLE_QUEEN" /D "USE_VORBIS" /D "WIN32" /YX /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "WIN32" /D "DISABLE_SWORD1" /YX /O2 /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -149,7 +149,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "DISABLE_QUEEN" /D "USE_VORBIS" /D "WIN32" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "DISABLE_SWORD1" /D "USE_VORBIS" /D "WIN32" /FR /YX /M$(CECrtMTDebug) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -158,7 +158,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib aygshell.lib  mad.lib SDLAudio.lib LibTremorCE.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib mad.lib SDLAudio.lib LibTremorCE.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 
 !ENDIF 
 
@@ -199,10 +199,23 @@ NODEP_CPP_CONFI=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CONFI=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONFI=\
-	"..\..\..\common\common\config-manager.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -261,11 +274,26 @@ NODEP_CPP_DEBUG=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_DEBUG=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\font.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\common\common\debugger.h"\
-	"..\..\..\common\gui\console.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -331,11 +359,11 @@ DEP_CPP_FILE_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FILE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -375,6 +403,75 @@ SOURCE=..\..\..\common\map.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\common\md5.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+NODEP_CPP_MD5_C=\
+	"..\..\..\common\common\file.h"\
+	"..\..\..\common\common\md5.h"\
+	"..\..\..\common\common\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+NODEP_CPP_MD5_C=\
+	"..\..\..\common\common\file.h"\
+	"..\..\..\common\common\md5.h"\
+	"..\..\..\common\common\util.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_MD5_C=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	
+NODEP_CPP_MD5_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_MD5_C=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\md5.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	
+NODEP_CPP_MD5_C=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\common\md5.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\common\rect.h
 # End Source File
 # Begin Source File
@@ -404,11 +501,18 @@ NODEP_CPP_SAVEF=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SAVEF=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SAVEF=\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\util.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -472,10 +576,17 @@ NODEP_CPP_STR_C=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_STR_C=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STR_C=\
-	"..\..\..\common\common\str.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -532,13 +643,25 @@ NODEP_CPP_SYSTE=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SYSTE=\
+	"..\..\..\backends\intern.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SYSTE=\
-	"..\..\..\common\backends\intern.h"\
-	"..\..\..\common\base\gameDetector.h"\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\system.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -601,12 +724,20 @@ NODEP_CPP_TIMER=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_TIMER=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TIMER=\
-	"..\..\..\common\common\scummsys.h"\
-	"..\..\..\common\common\timer.h"\
-	"..\..\..\common\common\util.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -662,11 +793,21 @@ NODEP_CPP_UTIL_=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_UTIL_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_UTIL_=\
-	"..\..\..\common\base\engine.h"\
-	"..\..\..\common\common\util.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -747,17 +888,17 @@ DEP_CPP_AUDIO=\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_AUDIO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -836,16 +977,29 @@ NODEP_CPP_AUDIOS=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_AUDIOS=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_AUDIOS=\
-	"..\..\..\sound\base\engine.h"\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -853,7 +1007,6 @@ NODEP_CPP_AUDIOS=\
 DEP_CPP_AUDIOS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\savefile.h"\
@@ -913,12 +1066,19 @@ NODEP_CPP_FMOPL=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_FMOPL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\sound\fmopl.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FMOPL=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -979,12 +1139,12 @@ DEP_CPP_MIDID=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\sound\mididrv.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDID=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1048,14 +1208,22 @@ NODEP_CPP_MIDIP=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MIDIP=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1119,14 +1287,22 @@ NODEP_CPP_MIDIPA=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MIDIPA=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIPA=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1186,14 +1362,22 @@ NODEP_CPP_MIDIPAR=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MIDIPAR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIPAR=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1231,7 +1415,9 @@ NODEP_CPP_MIXER=\
 	"..\..\..\sound\common\util.h"\
 	"..\..\..\sound\sound\audiostream.h"\
 	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\mp3.h"\
 	"..\..\..\sound\sound\rate.h"\
+	"..\..\..\sound\sound\vorbis.h"\
 	"..\..\..\sound\stdafx.h"\
 	
 
@@ -1242,7 +1428,9 @@ NODEP_CPP_MIXER=\
 	"..\..\..\sound\common\util.h"\
 	"..\..\..\sound\sound\audiostream.h"\
 	"..\..\..\sound\sound\mixer.h"\
+	"..\..\..\sound\sound\mp3.h"\
 	"..\..\..\sound\sound\rate.h"\
+	"..\..\..\sound\sound\vorbis.h"\
 	"..\..\..\sound\stdafx.h"\
 	
 
@@ -1256,24 +1444,28 @@ DEP_CPP_MIXER=\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MIXER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1286,13 +1478,17 @@ DEP_CPP_MIXER=\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
 	{$(INCLUDE)}"mad.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
 	{$(INCLUDE)}"vorbis\config_types.h"\
@@ -1322,8 +1518,8 @@ SOURCE=..\..\..\sound\mp3.cpp
 NODEP_CPP_MP3_C=\
 	"..\..\..\sound\common\file.h"\
 	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
 	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
@@ -1331,8 +1527,8 @@ NODEP_CPP_MP3_C=\
 NODEP_CPP_MP3_C=\
 	"..\..\..\sound\common\file.h"\
 	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
 	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
@@ -1350,19 +1546,20 @@ DEP_CPP_MP3_C=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_MP3_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1380,6 +1577,7 @@ DEP_CPP_MP3_C=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	{$(INCLUDE)}"mad.h"\
@@ -1437,15 +1635,22 @@ NODEP_CPP_MPU40=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MPU40=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MPU40=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1511,17 +1716,11 @@ DEP_CPP_RATE_=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\rate.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RATE_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1539,13 +1738,7 @@ DEP_CPP_RATE_=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\rate.h"\
-	{$(INCLUDE)}"mad.h"\
 	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"vorbis\config_types.h"\
-	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
-	{$(INCLUDE)}"vorbis\ogg.h"\
-	{$(INCLUDE)}"vorbis\os_types.h"\
-	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_RATE_=\
 	"..\..\..\common\config.h"\
@@ -1590,11 +1783,11 @@ DEP_CPP_VOC_C=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\voc.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VOC_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1631,8 +1824,8 @@ SOURCE=..\..\..\sound\vorbis.cpp
 NODEP_CPP_VORBI=\
 	"..\..\..\sound\common\file.h"\
 	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
 	"..\..\..\sound\sound\vorbis.h"\
-	"..\..\..\sound\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
@@ -1640,8 +1833,8 @@ NODEP_CPP_VORBI=\
 NODEP_CPP_VORBI=\
 	"..\..\..\sound\common\file.h"\
 	"..\..\..\sound\common\util.h"\
+	"..\..\..\sound\sound\audiostream.h"\
 	"..\..\..\sound\sound\vorbis.h"\
-	"..\..\..\sound\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
@@ -1659,19 +1852,20 @@ DEP_CPP_VORBI=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\vorbis.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_VORBI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1689,6 +1883,7 @@ DEP_CPP_VORBI=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\vorbis.h"\
 	{$(INCLUDE)}"mad.h"\
@@ -1758,11 +1953,11 @@ DEP_CPP_ABOUT=\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ABOUT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1842,11 +2037,11 @@ DEP_CPP_BROWS=\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_BROWS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1924,11 +2119,11 @@ DEP_CPP_CHOOS=\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CHOOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2008,11 +2203,11 @@ DEP_CPP_CONSO=\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\ScrollBarWidget.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2090,18 +2285,25 @@ NODEP_CPP_DIALO=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_DIALO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\font.h"\
 	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DIALO=\
-	"..\..\..\gui\common\scummsys.h"\
-	"..\..\..\gui\common\singleton.h"\
-	"..\..\..\gui\common\str.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\gui\font.h"\
-	"..\..\..\gui\gui\object.h"\
-	"..\..\..\gui\stdafx.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2175,11 +2377,11 @@ DEP_CPP_EDITT=\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_EDITT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2337,12 +2539,12 @@ DEP_CPP_LAUNC=\
 	"..\..\..\gui\TabWidget.h"\
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_LAUNC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2439,11 +2641,11 @@ DEP_CPP_LISTW=\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\ScrollBarWidget.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_LISTW=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2523,11 +2725,11 @@ DEP_CPP_MESSA=\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MESSA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2605,19 +2807,26 @@ NODEP_CPP_NEWGU=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_NEWGU=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\font.h"\
 	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NEWGU=\
-	"..\..\..\gui\common\scummsys.h"\
-	"..\..\..\gui\common\singleton.h"\
-	"..\..\..\gui\common\str.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\font.h"\
-	"..\..\..\gui\gui\object.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	"..\..\..\gui\scumm_globals.h"\
-	"..\..\..\gui\stdafx.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2724,12 +2933,12 @@ DEP_CPP_OPTIO=\
 	"..\..\..\gui\TabWidget.h"\
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_OPTIO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2820,11 +3029,11 @@ DEP_CPP_POPUP=\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\PopUpWidget.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_POPUP=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2891,13 +3100,26 @@ NODEP_CPP_SCROL=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SCROL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\font.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
 	"..\..\..\gui\ScrollBarWidget.h"\
+	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCROL=\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	"..\..\..\gui\stdafx.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2975,11 +3197,11 @@ DEP_CPP_TABWI=\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\TabWidget.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TABWI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -3057,11 +3279,11 @@ DEP_CPP_WIDGE=\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WIDGE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -3183,9 +3405,7 @@ NODEP_CPP_MISSI=\
 DEP_CPP_MISSI=\
 	"..\..\..\backends\wince\missing\dirent.h"\
 	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -3276,12 +3496,30 @@ NODEP_CPP_FINDG=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_FINDG=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\screen.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FINDG=\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -3351,12 +3589,12 @@ NODEP_CPP_GAPI_=\
 DEP_CPP_GAPI_=\
 	"..\..\..\backends\wince\dynamic_imports.h"\
 	"..\..\..\backends\wince\gapi_keys.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\screen.h"\
-	
-NODEP_CPP_GAPI_=\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\ipapi.h"\
-	".\x.h"\
+	"..\..\..\common\stdafx.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -3444,28 +3682,67 @@ NODEP_CPP_POCKE=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_POCKE=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\wince\dynamic_imports.h"\
 	"..\..\..\backends\wince\gapi_keys.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\pocketpc.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\screen.h"\
 	"..\..\..\backends\wince\smartphone.h"\
 	"..\..\..\backends\wince\wince.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\font.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\mididrv.h"\
+	{$(INCLUDE)}"begin_code.h"\
+	{$(INCLUDE)}"close_code.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"SDL.h"\
+	{$(INCLUDE)}"SDL_active.h"\
+	{$(INCLUDE)}"SDL_audio.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"SDL_cdrom.h"\
+	{$(INCLUDE)}"SDL_error.h"\
+	{$(INCLUDE)}"SDL_events.h"\
+	{$(INCLUDE)}"SDL_getenv.h"\
+	{$(INCLUDE)}"SDL_joystick.h"\
+	{$(INCLUDE)}"SDL_keyboard.h"\
+	{$(INCLUDE)}"SDL_keysym.h"\
+	{$(INCLUDE)}"SDL_main.h"\
+	{$(INCLUDE)}"SDL_mouse.h"\
+	{$(INCLUDE)}"SDL_mutex.h"\
+	{$(INCLUDE)}"SDL_quit.h"\
+	{$(INCLUDE)}"SDL_rwops.h"\
+	{$(INCLUDE)}"SDL_timer.h"\
+	{$(INCLUDE)}"SDL_types.h"\
+	{$(INCLUDE)}"SDL_version.h"\
+	{$(INCLUDE)}"SDL_video.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 NODEP_CPP_POCKE=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\timer.h"\
 	"..\..\..\backends\wince\GameX.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\SDL.h"\
-	"..\..\..\backends\wince\sound\mididrv.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\ipapi.h"\
-	".\x.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -3610,28 +3887,67 @@ NODEP_CPP_SCREE=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SCREE=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\wince\dynamic_imports.h"\
 	"..\..\..\backends\wince\gapi_keys.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\pocketpc.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\screen.h"\
 	"..\..\..\backends\wince\smartphone.h"\
 	"..\..\..\backends\wince\wince.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\font.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\mididrv.h"\
+	{$(INCLUDE)}"begin_code.h"\
+	{$(INCLUDE)}"close_code.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"SDL.h"\
+	{$(INCLUDE)}"SDL_active.h"\
+	{$(INCLUDE)}"SDL_audio.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"SDL_cdrom.h"\
+	{$(INCLUDE)}"SDL_error.h"\
+	{$(INCLUDE)}"SDL_events.h"\
+	{$(INCLUDE)}"SDL_getenv.h"\
+	{$(INCLUDE)}"SDL_joystick.h"\
+	{$(INCLUDE)}"SDL_keyboard.h"\
+	{$(INCLUDE)}"SDL_keysym.h"\
+	{$(INCLUDE)}"SDL_main.h"\
+	{$(INCLUDE)}"SDL_mouse.h"\
+	{$(INCLUDE)}"SDL_mutex.h"\
+	{$(INCLUDE)}"SDL_quit.h"\
+	{$(INCLUDE)}"SDL_rwops.h"\
+	{$(INCLUDE)}"SDL_timer.h"\
+	{$(INCLUDE)}"SDL_types.h"\
+	{$(INCLUDE)}"SDL_version.h"\
+	{$(INCLUDE)}"SDL_video.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 NODEP_CPP_SCREE=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\timer.h"\
 	"..\..\..\backends\wince\GameX.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\SDL.h"\
-	"..\..\..\backends\wince\sound\mididrv.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\ipapi.h"\
-	".\x.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\morphos_timer.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -3774,30 +4090,69 @@ NODEP_CPP_SMART=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SMART=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\wince\dynamic_imports.h"\
 	"..\..\..\backends\wince\gapi_keys.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\pocketpc.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\screen.h"\
 	"..\..\..\backends\wince\smartphone.h"\
 	"..\..\..\backends\wince\wince.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\font.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\mididrv.h"\
+	{$(INCLUDE)}"Aygshell.h"\
+	{$(INCLUDE)}"begin_code.h"\
+	{$(INCLUDE)}"close_code.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"SDL.h"\
+	{$(INCLUDE)}"SDL_active.h"\
+	{$(INCLUDE)}"SDL_audio.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"SDL_cdrom.h"\
+	{$(INCLUDE)}"SDL_error.h"\
+	{$(INCLUDE)}"SDL_events.h"\
+	{$(INCLUDE)}"SDL_getenv.h"\
+	{$(INCLUDE)}"SDL_joystick.h"\
+	{$(INCLUDE)}"SDL_keyboard.h"\
+	{$(INCLUDE)}"SDL_keysym.h"\
+	{$(INCLUDE)}"SDL_main.h"\
+	{$(INCLUDE)}"SDL_mouse.h"\
+	{$(INCLUDE)}"SDL_mutex.h"\
+	{$(INCLUDE)}"SDL_quit.h"\
+	{$(INCLUDE)}"SDL_rwops.h"\
+	{$(INCLUDE)}"SDL_timer.h"\
+	{$(INCLUDE)}"SDL_types.h"\
+	{$(INCLUDE)}"SDL_version.h"\
+	{$(INCLUDE)}"SDL_video.h"\
+	{$(INCLUDE)}"sipapi.h"\
+	{$(INCLUDE)}"winuserm.h"\
 	
 NODEP_CPP_SMART=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\timer.h"\
 	"..\..\..\backends\wince\GameX.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\SDL.h"\
-	"..\..\..\backends\wince\sound\mididrv.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\inuserm.h"\
-	".\ipapi.h"\
-	".\x.h"\
-	".\ygshell.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
 	
 
@@ -3948,32 +4303,76 @@ NODEP_CPP_WINCE=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_WINCE=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\wince\dynamic_imports.h"\
 	"..\..\..\backends\wince\gapi_keys.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\pocketpc.h"\
+	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\backends\wince\screen.h"\
 	"..\..\..\backends\wince\smartphone.h"\
 	"..\..\..\backends\wince\wince.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\base\gameDetector.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\gui\font.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\scumm\gfx.h"\
+	"..\..\..\scumm\script.h"\
+	"..\..\..\scumm\scumm.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
+	{$(INCLUDE)}"Aygshell.h"\
+	{$(INCLUDE)}"begin_code.h"\
+	{$(INCLUDE)}"close_code.h"\
+	{$(INCLUDE)}"gx.h"\
+	{$(INCLUDE)}"SDL.h"\
+	{$(INCLUDE)}"SDL_active.h"\
+	{$(INCLUDE)}"SDL_audio.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"SDL_cdrom.h"\
+	{$(INCLUDE)}"SDL_error.h"\
+	{$(INCLUDE)}"SDL_events.h"\
+	{$(INCLUDE)}"SDL_getenv.h"\
+	{$(INCLUDE)}"SDL_joystick.h"\
+	{$(INCLUDE)}"SDL_keyboard.h"\
+	{$(INCLUDE)}"SDL_keysym.h"\
+	{$(INCLUDE)}"SDL_main.h"\
+	{$(INCLUDE)}"SDL_mouse.h"\
+	{$(INCLUDE)}"SDL_mutex.h"\
+	{$(INCLUDE)}"SDL_quit.h"\
+	{$(INCLUDE)}"SDL_rwops.h"\
+	{$(INCLUDE)}"SDL_timer.h"\
+	{$(INCLUDE)}"SDL_types.h"\
+	{$(INCLUDE)}"SDL_version.h"\
+	{$(INCLUDE)}"SDL_video.h"\
+	{$(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"\
+	{$(INCLUDE)}"winuserm.h"\
 	
 NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\timer.h"\
 	"..\..\..\backends\wince\GameX.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\SDL.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
-	"..\..\..\backends\wince\sound\mididrv.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\inuserm.h"\
-	".\ipapi.h"\
-	".\x.h"\
-	".\ygshell.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\morphos_timer.h"\
 	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
 	
 
@@ -4095,10 +4494,14 @@ NODEP_CPP_WINDO=\
 
 DEP_CPP_WINDO=\
 	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\str.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4165,18 +4568,18 @@ DEP_CPP_ADLIB=\
 	"..\..\..\sound\fmopl.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ADLIB=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4217,6 +4620,7 @@ SOURCE=..\..\..\backends\midi\alsa.cpp
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
 NODEP_CPP_ALSA_=\
+	"..\..\..\backends\midi\common\config-manager.h"\
 	"..\..\..\backends\midi\common\util.h"\
 	"..\..\..\backends\midi\config.h"\
 	"..\..\..\backends\midi\sound\mpu401.h"\
@@ -4226,6 +4630,7 @@ NODEP_CPP_ALSA_=\
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
 NODEP_CPP_ALSA_=\
+	"..\..\..\backends\midi\common\config-manager.h"\
 	"..\..\..\backends\midi\common\util.h"\
 	"..\..\..\backends\midi\config.h"\
 	"..\..\..\backends\midi\sound\mpu401.h"\
@@ -4237,21 +4642,26 @@ NODEP_CPP_ALSA_=\
 DEP_CPP_ALSA_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ALSA_=\
 	"..\..\..\backends\midi\config.h"\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4259,9 +4669,14 @@ NODEP_CPP_ALSA_=\
 DEP_CPP_ALSA_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
@@ -4307,12 +4722,12 @@ DEP_CPP_COREA=\
 	"..\..\..\common\timer.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COREA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4375,6 +4790,7 @@ DEP_CPP_MORPH=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MORPH=\
 	"..\..\..\backends\midi\morphos.h"\
@@ -4382,7 +4798,6 @@ NODEP_CPP_MORPH=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4441,12 +4856,12 @@ DEP_CPP_NULL_=\
 	"..\..\..\common\timer.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NULL_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4503,12 +4918,12 @@ DEP_CPP_QUICK=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_QUICK=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4568,12 +4983,12 @@ DEP_CPP_SEQ_C=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SEQ_C=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4633,12 +5048,12 @@ DEP_CPP_WINDOW=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WINDOW=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4700,18 +5115,18 @@ DEP_CPP_YM261=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_YM261=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4801,18 +5216,18 @@ DEP_CPP_ENGIN=\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\mixer.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_ENGIN=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4910,19 +5325,19 @@ DEP_CPP_GAMED=\
 	"..\..\..\common\util.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
+	{$(INCLUDE)}"mad.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"vorbis\config_types.h"\
+	{$(INCLUDE)}"vorbis\ivorbiscodec.h"\
+	{$(INCLUDE)}"vorbis\ogg.h"\
+	{$(INCLUDE)}"vorbis\os_types.h"\
+	{$(INCLUDE)}"vorbis\vorbisfile.h"\
 	
 NODEP_CPP_GAMED=\
 	"..\..\..\base\config.h"\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -5031,34 +5446,34 @@ DEP_CPP_MAIN_=\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	{$(INCLUDE)}"begin_code.h"\
+	{$(INCLUDE)}"close_code.h"\
+	{$(INCLUDE)}"SDL.h"\
+	{$(INCLUDE)}"SDL_active.h"\
+	{$(INCLUDE)}"SDL_audio.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
+	{$(INCLUDE)}"SDL_cdrom.h"\
+	{$(INCLUDE)}"SDL_error.h"\
+	{$(INCLUDE)}"SDL_events.h"\
+	{$(INCLUDE)}"SDL_getenv.h"\
+	{$(INCLUDE)}"SDL_joystick.h"\
+	{$(INCLUDE)}"SDL_keyboard.h"\
+	{$(INCLUDE)}"SDL_keysym.h"\
+	{$(INCLUDE)}"SDL_main.h"\
+	{$(INCLUDE)}"SDL_mouse.h"\
+	{$(INCLUDE)}"SDL_mutex.h"\
+	{$(INCLUDE)}"SDL_quit.h"\
+	{$(INCLUDE)}"SDL_rwops.h"\
+	{$(INCLUDE)}"SDL_timer.h"\
+	{$(INCLUDE)}"SDL_types.h"\
+	{$(INCLUDE)}"SDL_version.h"\
+	{$(INCLUDE)}"SDL_video.h"\
 	
 NODEP_CPP_MAIN_=\
 	"..\..\..\base\allegro.h"\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\morphos_timer.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -5163,11 +5578,11 @@ DEP_CPP_PLUGI=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_PLUGI=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"