update, fix endlines

svn-id: r16649

1 files changed, 921 insertions, 16319 deletions

diff --git a/dists/msevc4/scummvm/scummvm.vcp b/dists/msevc4/scummvm/scummvm.vcp
index ff76dfcb20..30c3650bfb 100644
--- a/dists/msevc4/scummvm/scummvm.vcp
+++ b/dists/msevc4/scummvm/scummvm.vcp
@@ -397,16 +397,8 @@ SOURCE=..\..\..\common\scaler\2xsai.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_2XSAI=\
@@ -415,12 +407,12 @@ DEP_CPP_2XSAI=\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_2XSAI=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -431,10 +423,9 @@ DEP_CPP_2XSAI=\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_2XSAI=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -442,96 +433,16 @@ NODEP_CPP_2XSAI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_2XSAI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_2XSAI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_2XSAI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_2XSAI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_2XSAI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_2XSAI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_2XSAI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -541,18 +452,8 @@ SOURCE=..\..\..\common\scaler\aspect.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\scaler\common\scaler.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\scaler\common\scaler.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_ASPEC=\
@@ -562,12 +463,12 @@ DEP_CPP_ASPEC=\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ASPEC=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -579,10 +480,9 @@ DEP_CPP_ASPEC=\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_ASPEC=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -590,102 +490,16 @@ NODEP_CPP_ASPEC=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_ASPEC=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ASPEC=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_ASPEC=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ASPEC=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ASPEC=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ASPEC=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_ASPEC=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -695,18 +509,8 @@ SOURCE=..\..\..\common\scaler\hq2x.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\scaler\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\scaler\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_HQ2X_=\
@@ -716,12 +520,12 @@ DEP_CPP_HQ2X_=\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HQ2X_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -733,10 +537,9 @@ DEP_CPP_HQ2X_=\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_HQ2X_=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -744,102 +547,16 @@ NODEP_CPP_HQ2X_=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_HQ2X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_HQ2X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_HQ2X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_HQ2X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_HQ2X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_HQ2X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq2x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ2X_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -853,18 +570,8 @@ SOURCE=..\..\..\common\scaler\hq3x.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\scaler\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\scaler\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_HQ3X_=\
@@ -874,12 +581,12 @@ DEP_CPP_HQ3X_=\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_HQ3X_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -891,10 +598,9 @@ DEP_CPP_HQ3X_=\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_HQ3X_=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -902,102 +608,16 @@ NODEP_CPP_HQ3X_=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_HQ3X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_HQ3X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_HQ3X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_HQ3X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_HQ3X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_HQ3X_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\hq3x.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_HQ3X_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -1015,22 +635,8 @@ SOURCE=..\..\..\common\scaler\scale2x.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SCALE=\
-	"..\..\..\common\scaler\scale2x.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SCALE=\
-	"..\..\..\common\scaler\scale2x.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SCALE=\
@@ -1040,12 +646,12 @@ DEP_CPP_SCALE=\
 	"..\..\..\common\scaler\scale2x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCALE=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1057,122 +663,26 @@ DEP_CPP_SCALE=\
 	"..\..\..\common\scaler\scale2x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCALE=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCALE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCALE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCALE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCALE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCALE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCALE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -1186,22 +696,8 @@ SOURCE=..\..\..\common\scaler\scale3x.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SCALE3=\
-	"..\..\..\common\scaler\scale3x.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SCALE3=\
-	"..\..\..\common\scaler\scale3x.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SCALE3=\
@@ -1211,12 +707,12 @@ DEP_CPP_SCALE3=\
 	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCALE3=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1228,122 +724,26 @@ DEP_CPP_SCALE3=\
 	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCALE3=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCALE3=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCALE3=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCALE3=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCALE3=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCALE3=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCALE3=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALE3=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -1357,24 +757,8 @@ SOURCE=..\..\..\common\scaler\scalebit.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\scaler\common\scaler\intern.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SCALEB=\
@@ -1385,12 +769,12 @@ DEP_CPP_SCALEB=\
 	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCALEB=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1403,128 +787,26 @@ DEP_CPP_SCALEB=\
 	"..\..\..\common\scaler\scale3x.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCALEB=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCALEB=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scale2x.h"\
-	"..\..\..\common\scaler\scale3x.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALEB=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -1535,26 +817,16 @@ SOURCE=..\..\..\common\scaler\scalebit.h
 # End Group
 # Begin Source File
 
+SOURCE=..\..\..\common\array.h
+# End Source File
+# Begin Source File
+
 SOURCE="..\..\..\common\config-manager.cpp"
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CONFI=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_CONFI=\
-	"..\..\..\common\common\config-manager.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CONFI=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_CONFI=\
-	"..\..\..\common\common\config-manager.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CONFI=\
@@ -1568,12 +840,12 @@ DEP_CPP_CONFI=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONFI=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1589,10 +861,9 @@ DEP_CPP_CONFI=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_CONFI=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -1600,71 +871,16 @@ NODEP_CPP_CONFI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CONFI=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_CONFI=\
-	"..\..\..\common\common\config-manager.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CONFI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_CONFI=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CONFI=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_CONFI=\
-	"..\..\..\common\common\config-manager.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CONFI=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_CONFI=\
-	"..\..\..\common\common\config-manager.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CONFI=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_CONFI=\
-	"..\..\..\common\common\config-manager.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CONFI=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_CONFI=\
-	"..\..\..\common\common\config-manager.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -1678,24 +894,8 @@ SOURCE=..\..\..\common\debugger.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_DEBUG=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\common\debugger.h"\
-	"..\..\..\common\gui\console.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_DEBUG=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\common\debugger.h"\
-	"..\..\..\common\gui\console.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_DEBUG=\
@@ -1703,28 +903,28 @@ DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\debugger.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\console.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DEBUG=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1734,18 +934,17 @@ DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\debugger.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\console.h"\
 	"..\..\..\gui\dialog.h"\
@@ -1753,7 +952,7 @@ DEP_CPP_DEBUG=\
 	"..\..\..\gui\object.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -1761,86 +960,16 @@ NODEP_CPP_DEBUG=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_DEBUG=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\common\debugger.h"\
-	"..\..\..\common\gui\console.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_DEBUG=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_DEBUG=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\common\debugger.h"\
-	"..\..\..\common\gui\console.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_DEBUG=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\common\debugger.h"\
-	"..\..\..\common\gui\console.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_DEBUG=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\common\debugger.h"\
-	"..\..\..\common\gui\console.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_DEBUG=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\common\debugger.h"\
-	"..\..\..\common\gui\console.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -1854,18 +983,8 @@ SOURCE=..\..\..\common\file.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_FILE_=\
-	"..\..\..\common\common\file.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_FILE_=\
-	"..\..\..\common\common\file.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_FILE_=\
@@ -1878,12 +997,12 @@ DEP_CPP_FILE_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FILE_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -1898,10 +1017,9 @@ DEP_CPP_FILE_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_FILE_=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -1909,125 +1027,16 @@ NODEP_CPP_FILE_=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_FILE_=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_FILE_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_FILE_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_FILE_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_FILE_=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_FILE_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_FILE_=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_FILE_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_FILE_=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_FILE_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_FILE_=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_FILE_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -2049,20 +1058,8 @@ 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=\
@@ -2076,12 +1073,12 @@ DEP_CPP_MD5_C=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MD5_C=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2097,10 +1094,9 @@ DEP_CPP_MD5_C=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_MD5_C=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -2108,137 +1104,89 @@ NODEP_CPP_MD5_C=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) 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"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_MD5_C=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MD5_C=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\md5.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_MD5_C=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) 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"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_MD5_C=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) 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"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_MD5_C=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MD5_C=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\common\md5.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\common\mutex.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_MUTEX=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\md5.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
-NODEP_CPP_MD5_C=\
+NODEP_CPP_MUTEX=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_MD5_C=\
+DEP_CPP_MUTEX=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\md5.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
-NODEP_CPP_MD5_C=\
+NODEP_CPP_MUTEX=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
 	
 
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\common\md5.h
+SOURCE=..\..\..\common\mutex.h
 # End Source File
 # Begin Source File
 
@@ -2250,24 +1198,8 @@ SOURCE=..\..\..\common\savefile.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SAVEF=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SAVEF=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SAVEF=\
@@ -2283,14 +1215,14 @@ DEP_CPP_SAVEF=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(INCLUDE)}"zconf.h"\
-	{$(INCLUDE)}"zlib.h"\
 	
 NODEP_CPP_SAVEF=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\conf.h"\
+	".\DL_byteorder.h"\
+	".\lib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2298,15 +1230,19 @@ NODEP_CPP_SAVEF=\
 DEP_CPP_SAVEF=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\map.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_SAVEF=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\conf.h"\
@@ -2316,75 +1252,16 @@ NODEP_CPP_SAVEF=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SAVEF=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SAVEF=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\conf.h"\
-	".\DL_byteorder.h"\
-	".\lib.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SAVEF=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SAVEF=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SAVEF=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SAVEF=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SAVEF=\
-	"..\..\..\common\common\savefile.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -2398,20 +1275,8 @@ SOURCE=..\..\..\common\scaler.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCALER=\
-	"..\..\..\common\common\scaler\intern.h"\
-	"..\..\..\common\common\scaler\scalebit.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCALER=\
-	"..\..\..\common\common\scaler\intern.h"\
-	"..\..\..\common\common\scaler\scalebit.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SCALER=\
@@ -2422,12 +1287,12 @@ DEP_CPP_SCALER=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCALER=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2436,13 +1301,13 @@ DEP_CPP_SCALER=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\scaler\intern.h"\
+	"..\..\..\common\scaler\scalebit.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_SCALER=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -2450,113 +1315,16 @@ NODEP_CPP_SCALER=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCALER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALER=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCALER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scaler\scalebit.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALER=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCALER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALER=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCALER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALER=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCALER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALER=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCALER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_SCALER=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -2582,22 +1350,8 @@ SOURCE=..\..\..\common\str.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_STR_C=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_STR_C=\
-	"..\..\..\common\common\str.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_STR_C=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_STR_C=\
-	"..\..\..\common\common\str.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_STR_C=\
@@ -2607,12 +1361,12 @@ DEP_CPP_STR_C=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STR_C=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2624,10 +1378,9 @@ DEP_CPP_STR_C=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_STR_C=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -2635,67 +1388,16 @@ NODEP_CPP_STR_C=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_STR_C=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_STR_C=\
-	"..\..\..\common\common\str.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_STR_C=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_STR_C=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_STR_C=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_STR_C=\
-	"..\..\..\common\common\str.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_STR_C=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_STR_C=\
-	"..\..\..\common\common\str.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_STR_C=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_STR_C=\
-	"..\..\..\common\common\str.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_STR_C=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_STR_C=\
-	"..\..\..\common\common\str.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -2709,22 +1411,8 @@ SOURCE=..\..\..\common\stream.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_STREA=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_STREA=\
-	"..\..\..\common\common\stream.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_STREA=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_STREA=\
-	"..\..\..\common\common\stream.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_STREA=\
@@ -2733,12 +1421,12 @@ DEP_CPP_STREA=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_STREA=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2749,10 +1437,9 @@ DEP_CPP_STREA=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_STREA=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -2760,94 +1447,16 @@ NODEP_CPP_STREA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_STREA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_STREA=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_STREA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_STREA=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_STREA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_STREA=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_STREA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_STREA=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_STREA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_STREA=\
-	"..\..\..\common\extend.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_STREA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_STREA=\
-	"..\..\..\common\extend.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -2861,28 +1470,8 @@ SOURCE=..\..\..\common\system.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SYSTE=\
-	"..\..\..\common\backends\intern.h"\
-	"..\..\..\common\base\gameDetector.h"\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\system.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SYSTE=\
-	"..\..\..\common\backends\intern.h"\
-	"..\..\..\common\base\gameDetector.h"\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\system.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SYSTE=\
@@ -2893,6 +1482,7 @@ DEP_CPP_SYSTE=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -2902,15 +1492,15 @@ DEP_CPP_SYSTE=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SYSTE=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -2923,6 +1513,7 @@ DEP_CPP_SYSTE=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
@@ -2932,13 +1523,12 @@ DEP_CPP_SYSTE=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\object.h"\
 	
 NODEP_CPP_SYSTE=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -2946,95 +1536,16 @@ NODEP_CPP_SYSTE=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SYSTE=\
-	"..\..\..\common\backends\intern.h"\
-	"..\..\..\common\base\gameDetector.h"\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\system.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_SYSTE=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SYSTE=\
-	"..\..\..\common\backends\intern.h"\
-	"..\..\..\common\base\gameDetector.h"\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\system.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SYSTE=\
-	"..\..\..\common\backends\intern.h"\
-	"..\..\..\common\base\gameDetector.h"\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\system.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SYSTE=\
-	"..\..\..\common\backends\intern.h"\
-	"..\..\..\common\base\gameDetector.h"\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\system.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SYSTE=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_SYSTE=\
-	"..\..\..\common\backends\intern.h"\
-	"..\..\..\common\base\gameDetector.h"\
-	"..\..\..\common\common\config-manager.h"\
-	"..\..\..\common\common\system.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -3048,46 +1559,28 @@ SOURCE=..\..\..\common\timer.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_TIMER=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_TIMER=\
-	"..\..\..\common\common\scummsys.h"\
-	"..\..\..\common\common\timer.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_TIMER=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_TIMER=\
-	"..\..\..\common\common\scummsys.h"\
-	"..\..\..\common\common\timer.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_TIMER=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TIMER=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -3095,18 +1588,17 @@ NODEP_CPP_TIMER=\
 DEP_CPP_TIMER=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_TIMER=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -3115,82 +1607,16 @@ NODEP_CPP_TIMER=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_TIMER=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_TIMER=\
-	"..\..\..\common\common\scummsys.h"\
-	"..\..\..\common\common\timer.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_TIMER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_TIMER=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_TIMER=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_TIMER=\
-	"..\..\..\common\common\scummsys.h"\
-	"..\..\..\common\common\timer.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_TIMER=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_TIMER=\
-	"..\..\..\common\common\scummsys.h"\
-	"..\..\..\common\common\timer.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_TIMER=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_TIMER=\
-	"..\..\..\common\common\scummsys.h"\
-	"..\..\..\common\common\timer.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_TIMER=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_TIMER=\
-	"..\..\..\common\common\scummsys.h"\
-	"..\..\..\common\common\timer.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -3204,46 +1630,25 @@ SOURCE=..\..\..\common\util.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_UTIL_=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_UTIL_=\
-	"..\..\..\common\base\engine.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_UTIL_=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_UTIL_=\
-	"..\..\..\common\base\engine.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_UTIL_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_UTIL_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -3253,18 +1658,13 @@ DEP_CPP_UTIL_=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_UTIL_=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -3272,78 +1672,16 @@ NODEP_CPP_UTIL_=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_UTIL_=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_UTIL_=\
-	"..\..\..\common\base\engine.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_UTIL_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_UTIL_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_UTIL_=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_UTIL_=\
-	"..\..\..\common\base\engine.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_UTIL_=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_UTIL_=\
-	"..\..\..\common\base\engine.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_UTIL_=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_UTIL_=\
-	"..\..\..\common\base\engine.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_UTIL_=\
-	"..\..\..\common\stdafx.h"\
-	
-NODEP_CPP_UTIL_=\
-	"..\..\..\common\base\engine.h"\
-	"..\..\..\common\common\util.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -3355,259 +1693,234 @@ SOURCE=..\..\..\common\util.h
 # Begin Group "sound"
 
 # PROP Default_Filter ""
+# Begin Group "softsynth"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\sound\audiocd.cpp
+SOURCE=..\..\..\sound\softsynth\adlib.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_AUDIO=\
-	"..\..\..\sound\base\engine.h"\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\flac.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\sound\vorbis.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_AUDIO=\
-	"..\..\..\sound\base\engine.h"\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\flac.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\sound\vorbis.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_ADLIB=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_ADLIB=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_ADLIB=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\fmopl.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_AUDIO=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_ADLIB=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_AUDIO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_AUDIO=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_AUDIO=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\sound\softsynth\emumidi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\sound\softsynth\ym2612.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_YM261=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_AUDIO=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_YM261=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_AUDIO=\
+DEP_CPP_YM261=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\softsynth\emumidi.h"\
 	
-NODEP_CPP_AUDIO=\
+NODEP_CPP_YM261=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\morphos_timer.h"\
 	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_AUDIO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_AUDIO=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\sound\audiocd.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
 DEP_CPP_AUDIO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
 	
 NODEP_CPP_AUDIO=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_AUDIO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiocd.h"\
+	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
 	
 NODEP_CPP_AUDIO=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
 	
 
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
 !ENDIF 
 
 # End Source File
@@ -3621,34 +1934,8 @@ SOURCE=..\..\..\sound\audiostream.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_AUDIOS=\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.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"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_AUDIOS=\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.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"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_AUDIOS=\
@@ -3656,25 +1943,23 @@ DEP_CPP_AUDIOS=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_AUDIOS=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -3684,15 +1969,12 @@ DEP_CPP_AUDIOS=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
@@ -3700,7 +1982,7 @@ DEP_CPP_AUDIOS=\
 	"..\..\..\sound\vorbis.h"\
 	
 NODEP_CPP_AUDIOS=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -3708,143 +1990,16 @@ NODEP_CPP_AUDIOS=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_AUDIOS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_AUDIOS=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_AUDIOS=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_AUDIOS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) 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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_AUDIOS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_AUDIOS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) 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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_AUDIOS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -3858,24 +2013,8 @@ SOURCE=..\..\..\sound\flac.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_FLAC_=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\flac.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_FLAC_=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\flac.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_FLAC_=\
@@ -3883,79 +2022,20 @@ DEP_CPP_FLAC_=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FLAC_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_FLAC_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_FLAC_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_FLAC_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_FLAC_=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -3966,30 +2046,27 @@ NODEP_CPP_FLAC_=\
 	".\LAC\stream_decoder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_FLAC_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_FLAC_=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -4000,122 +2077,18 @@ NODEP_CPP_FLAC_=\
 	".\LAC\stream_decoder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_FLAC_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_FLAC_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_FLAC_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_FLAC_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_FLAC_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_FLAC_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_FLAC_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_FLAC_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -4129,26 +2102,8 @@ SOURCE=..\..\..\sound\fmopl.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_FMOPL=\
-	"..\..\..\sound\fmopl.h"\
-	
-NODEP_CPP_FMOPL=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_FMOPL=\
-	"..\..\..\sound\fmopl.h"\
-	
-NODEP_CPP_FMOPL=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_FMOPL=\
@@ -4162,13 +2117,13 @@ DEP_CPP_FMOPL=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\fmopl.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FMOPL=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4184,11 +2139,10 @@ DEP_CPP_FMOPL=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\fmopl.h"\
 	
 NODEP_CPP_FMOPL=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -4196,82 +2150,16 @@ NODEP_CPP_FMOPL=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_FMOPL=\
-	"..\..\..\sound\fmopl.h"\
-	
-NODEP_CPP_FMOPL=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_FMOPL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\fmopl.h"\
-	
-NODEP_CPP_FMOPL=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_FMOPL=\
-	"..\..\..\sound\fmopl.h"\
-	
-NODEP_CPP_FMOPL=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_FMOPL=\
-	"..\..\..\sound\fmopl.h"\
-	
-NODEP_CPP_FMOPL=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_FMOPL=\
-	"..\..\..\sound\fmopl.h"\
-	
-NODEP_CPP_FMOPL=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_FMOPL=\
-	"..\..\..\sound\fmopl.h"\
-	
-NODEP_CPP_FMOPL=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -4285,52 +2173,32 @@ SOURCE=..\..\..\sound\mididrv.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MIDID=\
-	"..\..\..\sound\base\engine.h"\
-	"..\..\..\sound\common\config-manager.h"\
-	"..\..\..\sound\common\str.h"\
-	"..\..\..\sound\sound\mididrv.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MIDID=\
-	"..\..\..\sound\base\engine.h"\
-	"..\..\..\sound\common\config-manager.h"\
-	"..\..\..\sound\common\str.h"\
-	"..\..\..\sound\sound\mididrv.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MIDID=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDID=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4338,21 +2206,21 @@ NODEP_CPP_MIDID=\
 DEP_CPP_MIDID=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_MIDID=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -4361,135 +2229,16 @@ NODEP_CPP_MIDID=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MIDID=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_MIDID=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIDID=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_MIDID=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MIDID=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_MIDID=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MIDID=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_MIDID=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDID=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_MIDID=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDID=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_MIDID=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -4503,52 +2252,27 @@ SOURCE=..\..\..\sound\midiparser.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_MIDIP=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIP=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_MIDIP=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIP=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIP=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4556,20 +2280,16 @@ NODEP_CPP_MIDIP=\
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	
 NODEP_CPP_MIDIP=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -4578,94 +2298,16 @@ NODEP_CPP_MIDIP=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MIDIP=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIP=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIDIP=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIP=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MIDIP=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIP=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MIDIP=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIP=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDIP=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIP=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDIP=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIP=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -4679,52 +2321,27 @@ SOURCE=..\..\..\sound\midiparser_smf.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_MIDIPA=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPA=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_MIDIPA=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPA=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MIDIPA=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIPA=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4732,20 +2349,16 @@ NODEP_CPP_MIDIPA=\
 DEP_CPP_MIDIPA=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	
 NODEP_CPP_MIDIPA=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -4754,94 +2367,16 @@ NODEP_CPP_MIDIPA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MIDIPA=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPA=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIDIPA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPA=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MIDIPA=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPA=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MIDIPA=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPA=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDIPA=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPA=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDIPA=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPA=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -4851,52 +2386,27 @@ SOURCE=..\..\..\sound\midiparser_xmidi.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_MIDIPAR=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPAR=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_MIDIPAR=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPAR=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MIDIPAR=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIDIPAR=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -4904,20 +2414,16 @@ NODEP_CPP_MIDIPAR=\
 DEP_CPP_MIDIPAR=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	
 NODEP_CPP_MIDIPAR=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -4926,94 +2432,16 @@ NODEP_CPP_MIDIPAR=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MIDIPAR=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPAR=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIDIPAR=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPAR=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MIDIPAR=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPAR=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MIDIPAR=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPAR=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIDIPAR=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPAR=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIDIPAR=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\midiparser.h"\
-	
-NODEP_CPP_MIDIPAR=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -5023,61 +2451,37 @@ SOURCE=..\..\..\sound\mixer.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MIXER=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\flac.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\sound\rate.h"\
-	"..\..\..\sound\sound\vorbis.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MIXER=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\flac.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	"..\..\..\sound\sound\rate.h"\
-	"..\..\..\sound\sound\vorbis.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MIXER=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\rate.h"\
 	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MIXER=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -5088,15 +2492,15 @@ DEP_CPP_MIXER=\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
@@ -5105,7 +2509,7 @@ DEP_CPP_MIXER=\
 	"..\..\..\sound\vorbis.h"\
 	
 NODEP_CPP_MIXER=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -5113,165 +2517,16 @@ NODEP_CPP_MIXER=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MIXER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_MIXER=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MIXER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_MIXER=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MIXER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_MIXER=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MIXER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_MIXER=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MIXER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_MIXER=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MIXER=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_MIXER=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -5285,24 +2540,8 @@ SOURCE=..\..\..\sound\mp3.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MP3_C=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MP3_C=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mp3.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MP3_C=\
@@ -5310,26 +2549,24 @@ DEP_CPP_MP3_C=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
-	{$(INCLUDE)}"mad.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MP3_C=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\ad.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -5339,23 +2576,20 @@ DEP_CPP_MP3_C=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	
 NODEP_CPP_MP3_C=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\ad.h"\
@@ -5364,164 +2598,16 @@ NODEP_CPP_MP3_C=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MP3_C=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	
-NODEP_CPP_MP3_C=\
-	"..\..\..\common\extend.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MP3_C=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	
-NODEP_CPP_MP3_C=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MP3_C=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	
-NODEP_CPP_MP3_C=\
-	"..\..\..\common\extend.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MP3_C=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	
-NODEP_CPP_MP3_C=\
-	"..\..\..\common\extend.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MP3_C=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	
-NODEP_CPP_MP3_C=\
-	"..\..\..\common\extend.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MP3_C=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	
-NODEP_CPP_MP3_C=\
-	"..\..\..\common\extend.h"\
-	".\ad.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -5535,54 +2621,27 @@ SOURCE=..\..\..\sound\mpu401.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_MPU40=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MPU40=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_MPU40=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MPU40=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MPU40=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MPU40=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -5590,20 +2649,16 @@ NODEP_CPP_MPU40=\
 DEP_CPP_MPU40=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
 	
 NODEP_CPP_MPU40=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -5612,99 +2667,16 @@ NODEP_CPP_MPU40=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MPU40=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MPU40=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MPU40=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MPU40=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MPU40=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MPU40=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MPU40=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MPU40=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MPU40=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MPU40=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MPU40=\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MPU40=\
-	"..\..\..\sound\common\scummsys.h"\
-	"..\..\..\sound\common\system.h"\
-	"..\..\..\sound\common\timer.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -5718,44 +2690,29 @@ SOURCE=..\..\..\sound\rate.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_RATE_=\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\rate.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_RATE_=\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\rate.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_RATE_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RATE_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -5765,20 +2722,17 @@ DEP_CPP_RATE_=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\rate.h"\
 	
 NODEP_CPP_RATE_=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -5786,140 +2740,16 @@ NODEP_CPP_RATE_=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_RATE_=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\rate.h"\
-	
-NODEP_CPP_RATE_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_RATE_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\rate.h"\
-	
-NODEP_CPP_RATE_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_RATE_=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\rate.h"\
-	
-NODEP_CPP_RATE_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_RATE_=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\rate.h"\
-	
-NODEP_CPP_RATE_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_RATE_=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\rate.h"\
-	
-NODEP_CPP_RATE_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_RATE_=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\rate.h"\
-	
-NODEP_CPP_RATE_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -5933,47 +2763,27 @@ SOURCE=..\..\..\sound\voc.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_VOC_C=\
-	"..\..\..\sound\common\stream.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\voc.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_VOC_C=\
-	"..\..\..\sound\common\stream.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\mixer.h"\
-	"..\..\..\sound\sound\voc.h"\
-	"..\..\..\sound\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_VOC_C=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\voc.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_VOC_C=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -5981,23 +2791,17 @@ NODEP_CPP_VOC_C=\
 DEP_CPP_VOC_C=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\voc.h"\
 	
 NODEP_CPP_VOC_C=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -6005,143 +2809,16 @@ NODEP_CPP_VOC_C=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_VOC_C=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
-	
-NODEP_CPP_VOC_C=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_VOC_C=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
-	
-NODEP_CPP_VOC_C=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_VOC_C=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
-	
-NODEP_CPP_VOC_C=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_VOC_C=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
-	
-NODEP_CPP_VOC_C=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_VOC_C=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
-	
-NODEP_CPP_VOC_C=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_VOC_C=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\voc.h"\
-	
-NODEP_CPP_VOC_C=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -6155,24 +2832,8 @@ SOURCE=..\..\..\sound\vorbis.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_VORBI=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\vorbis.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_VORBI=\
-	"..\..\..\sound\common\file.h"\
-	"..\..\..\sound\common\util.h"\
-	"..\..\..\sound\sound\audiocd.h"\
-	"..\..\..\sound\sound\audiostream.h"\
-	"..\..\..\sound\sound\vorbis.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_VORBI=\
@@ -6180,30 +2841,28 @@ DEP_CPP_VORBI=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\vorbis.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	{$(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=\
+	"..\..\..\..\..\..\PROGRAM FILES\WINDOWS CE TOOLS\WCE420\POCKET PC 2003\INCLUDE\ARMV4\ogg\config_types.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
+	".\gg\ogg.h"\
+	".\gg\os_types.h"\
+	".\orbis\codec.h"\
+	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -6213,223 +2872,117 @@ DEP_CPP_VORBI=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\vorbis.h"\
 	
 NODEP_CPP_VORBI=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\..\..\..\PROGRAM FILES\WINDOWS CE TOOLS\WCE420\POCKET PC 2003\INCLUDE\ARMV4\ogg\config_types.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
+	".\gg\ogg.h"\
+	".\gg\os_types.h"\
+	".\orbis\codec.h"\
 	".\orbis\vorbisfile.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_VORBI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_VORBI=\
-	"..\..\..\common\extend.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 ARM) Release"
 
-DEP_CPP_VORBI=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\sound\vorbis.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\sound\wave.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_WAVE_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_VORBI=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_WAVE_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.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 MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_VORBI=\
+DEP_CPP_WAVE_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_VORBI=\
+NODEP_CPP_WAVE_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.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 MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_VORBI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_VORBI=\
-	"..\..\..\common\extend.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 ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_VORBI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_VORBI=\
-	"..\..\..\common\extend.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 MIPS) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_VORBI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiocd.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\vorbis.h"\
-	
-NODEP_CPP_VORBI=\
-	"..\..\..\common\extend.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 SH3) Release"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sound\vorbis.h
+SOURCE=..\..\..\sound\wave.h
 # End Source File
 # End Group
 # Begin Group "gui"
@@ -6441,58 +2994,40 @@ SOURCE=..\..\..\gui\about.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ABOUT=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\gui\about.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ABOUT=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\gui\about.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_ABOUT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
 	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\about.h"\
+	"..\..\..\gui\credits.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ABOUT=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -6503,27 +3038,27 @@ DEP_CPP_ABOUT=\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\about.h"\
+	"..\..\..\gui\credits.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_ABOUT=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -6531,194 +3066,16 @@ NODEP_CPP_ABOUT=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_ABOUT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_ABOUT=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ABOUT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_ABOUT=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_ABOUT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_ABOUT=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ABOUT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_ABOUT=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ABOUT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_ABOUT=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ABOUT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_ABOUT=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -6732,24 +3089,8 @@ SOURCE=..\..\..\gui\browser.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_BROWS=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_BROWS=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_BROWS=\
@@ -6757,18 +3098,17 @@ DEP_CPP_BROWS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\browser.h"\
 	"..\..\..\gui\dialog.h"\
@@ -6776,11 +3116,12 @@ 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"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -6790,18 +3131,17 @@ DEP_CPP_BROWS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\browser.h"\
 	"..\..\..\gui\dialog.h"\
@@ -6811,7 +3151,7 @@ DEP_CPP_BROWS=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_BROWS=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -6819,194 +3159,16 @@ NODEP_CPP_BROWS=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_BROWS=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_BROWS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_BROWS=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_BROWS=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_BROWS=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_BROWS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_BROWS=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_BROWS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_BROWS=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_BROWS=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_BROWS=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_BROWS=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -7020,22 +3182,8 @@ SOURCE=..\..\..\gui\chooser.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CHOOS=\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CHOOS=\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CHOOS=\
@@ -7043,17 +3191,14 @@ DEP_CPP_CHOOS=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\chooser.h"\
 	"..\..\..\gui\dialog.h"\
@@ -7061,11 +3206,12 @@ 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"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -7075,17 +3221,14 @@ DEP_CPP_CHOOS=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\chooser.h"\
 	"..\..\..\gui\dialog.h"\
@@ -7095,7 +3238,7 @@ DEP_CPP_CHOOS=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_CHOOS=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -7103,188 +3246,16 @@ NODEP_CPP_CHOOS=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CHOOS=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CHOOS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CHOOS=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CHOOS=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CHOOS=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CHOOS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CHOOS=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CHOOS=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CHOOS=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CHOOS=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CHOOS=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CHOOS=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -7298,47 +3269,27 @@ SOURCE=..\..\..\gui\console.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CONSO=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\graphics\font.h"\
-	"..\..\..\gui\gui\console.h"\
-	"..\..\..\gui\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CONSO=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\graphics\font.h"\
-	"..\..\..\gui\gui\console.h"\
-	"..\..\..\gui\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CONSO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
 	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\console.h"\
 	"..\..\..\gui\dialog.h"\
@@ -7346,11 +3297,12 @@ 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"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -7361,18 +3313,17 @@ DEP_CPP_CONSO=\
 	"..\..\..\base\engine.h"\
 	"..\..\..\base\version.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\console.h"\
 	"..\..\..\gui\dialog.h"\
@@ -7382,7 +3333,7 @@ DEP_CPP_CONSO=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_CONSO=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -7390,200 +3341,16 @@ NODEP_CPP_CONSO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CONSO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CONSO=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CONSO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CONSO=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CONSO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CONSO=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CONSO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CONSO=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CONSO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CONSO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CONSO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CONSO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -7597,18 +3364,8 @@ SOURCE=..\..\..\gui\consolefont.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CONSOL=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CONSOL=\
-	"..\..\..\gui\common\stdafx.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CONSOL=\
@@ -7620,14 +3377,14 @@ DEP_CPP_CONSOL=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONSOL=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -7641,136 +3398,28 @@ DEP_CPP_CONSOL=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CONSOL=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CONSOL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_CONSOL=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CONSOL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_CONSOL=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CONSOL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_CONSOL=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CONSOL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_CONSOL=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CONSOL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_CONSOL=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CONSOL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_CONSOL=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -7780,68 +3429,36 @@ SOURCE=..\..\..\gui\dialog.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_DIALO=\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_DIALO=\
-	"..\..\..\gui\common\scummsys.h"\
-	"..\..\..\gui\common\singleton.h"\
-	"..\..\..\gui\common\stack.h"\
-	"..\..\..\gui\common\str.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\graphics\font.h"\
-	"..\..\..\gui\gui\object.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_DIALO=\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_DIALO=\
-	"..\..\..\gui\common\scummsys.h"\
-	"..\..\..\gui\common\singleton.h"\
-	"..\..\..\gui\common\stack.h"\
-	"..\..\..\gui\common\str.h"\
-	"..\..\..\gui\common\system.h"\
-	"..\..\..\gui\graphics\font.h"\
-	"..\..\..\gui\gui\object.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_DIALO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -7850,18 +3467,17 @@ DEP_CPP_DIALO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
@@ -7869,7 +3485,7 @@ DEP_CPP_DIALO=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_DIALO=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -7877,176 +3493,16 @@ NODEP_CPP_DIALO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_DIALO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_DIALO=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_DIALO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_DIALO=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_DIALO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_DIALO=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_DIALO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_DIALO=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_DIALO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_DIALO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_DIALO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_DIALO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -8060,22 +3516,8 @@ SOURCE=..\..\..\gui\EditTextWidget.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_EDITT=\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\EditTextWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_EDITT=\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\EditTextWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_EDITT=\
@@ -8083,28 +3525,26 @@ DEP_CPP_EDITT=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\EditTextWidget.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_EDITT=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -8114,17 +3554,14 @@ DEP_CPP_EDITT=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\EditTextWidget.h"\
@@ -8133,7 +3570,7 @@ DEP_CPP_EDITT=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_EDITT=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -8141,182 +3578,16 @@ NODEP_CPP_EDITT=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_EDITT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_EDITT=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_EDITT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_EDITT=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_EDITT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_EDITT=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_EDITT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_EDITT=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_EDITT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_EDITT=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_EDITT=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_EDITT=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -8330,58 +3601,13 @@ SOURCE=..\..\..\gui\launcher.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_LAUNC=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\gameDetector.h"\
-	"..\..\..\gui\base\plugins.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\common\config-manager.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\about.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\EditTextWidget.h"\
-	"..\..\..\gui\gui\launcher.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\message.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\options.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
-	"..\..\..\gui\sound\mididrv.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_LAUNC=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\base\gameDetector.h"\
-	"..\..\..\gui\base\plugins.h"\
-	"..\..\..\gui\base\version.h"\
-	"..\..\..\gui\common\config-manager.h"\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\about.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\EditTextWidget.h"\
-	"..\..\..\gui\gui\launcher.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\message.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\options.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
-	"..\..\..\gui\sound\mididrv.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_LAUNC=\
 	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -8391,19 +3617,17 @@ DEP_CPP_LAUNC=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\about.h"\
 	"..\..\..\gui\browser.h"\
@@ -8420,18 +3644,20 @@ 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\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_LAUNC=\
 	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -8441,19 +3667,17 @@ DEP_CPP_LAUNC=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\about.h"\
 	"..\..\..\gui\browser.h"\
@@ -8472,7 +3696,7 @@ DEP_CPP_LAUNC=\
 	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_LAUNC=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -8481,296 +3705,16 @@ NODEP_CPP_LAUNC=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_LAUNC=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_LAUNC=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_LAUNC=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_LAUNC=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_LAUNC=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_LAUNC=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_LAUNC=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_LAUNC=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_LAUNC=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_LAUNC=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_LAUNC=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\about.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\EditTextWidget.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_LAUNC=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -8784,24 +3728,8 @@ SOURCE=..\..\..\gui\ListWidget.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_LISTW=\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_LISTW=\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\ListWidget.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_LISTW=\
@@ -8809,17 +3737,14 @@ DEP_CPP_LISTW=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\ListWidget.h"\
@@ -8827,11 +3752,12 @@ 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"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -8841,17 +3767,14 @@ DEP_CPP_LISTW=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\ListWidget.h"\
@@ -8861,7 +3784,7 @@ DEP_CPP_LISTW=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_LISTW=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -8869,188 +3792,16 @@ NODEP_CPP_LISTW=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_LISTW=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_LISTW=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_LISTW=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_LISTW=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_LISTW=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_LISTW=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_LISTW=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_LISTW=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_LISTW=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_LISTW=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_LISTW=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_LISTW=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -9064,24 +3815,8 @@ SOURCE=..\..\..\gui\message.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MESSA=\
-	"..\..\..\gui\common\str.h"\
-	"..\..\..\gui\gui\message.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MESSA=\
-	"..\..\..\gui\common\str.h"\
-	"..\..\..\gui\gui\message.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MESSA=\
@@ -9089,28 +3824,26 @@ DEP_CPP_MESSA=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MESSA=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -9120,17 +3853,14 @@ DEP_CPP_MESSA=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
@@ -9139,7 +3869,7 @@ DEP_CPP_MESSA=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_MESSA=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -9147,182 +3877,16 @@ NODEP_CPP_MESSA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MESSA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_MESSA=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MESSA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_MESSA=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MESSA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_MESSA=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MESSA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_MESSA=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MESSA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_MESSA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MESSA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_MESSA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -9336,49 +3900,35 @@ SOURCE=..\..\..\gui\newgui.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_NEWGU=\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_NEWGU=\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_NEWGU=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -9387,25 +3937,24 @@ DEP_CPP_NEWGU=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	
 NODEP_CPP_NEWGU=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -9413,170 +3962,16 @@ NODEP_CPP_NEWGU=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_NEWGU=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_NEWGU=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_NEWGU=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_NEWGU=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_NEWGU=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_NEWGU=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_NEWGU=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_NEWGU=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_NEWGU=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_NEWGU=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_NEWGU=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_NEWGU=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -9594,66 +3989,37 @@ SOURCE=..\..\..\gui\options.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_OPTIO=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\base\gameDetector.h"\
-	"..\..\..\gui\common\config-manager.h"\
-	"..\..\..\gui\common\scaler.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\options.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
-	"..\..\..\gui\sound\mididrv.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_OPTIO=\
-	"..\..\..\gui\backends\fs\fs.h"\
-	"..\..\..\gui\base\gameDetector.h"\
-	"..\..\..\gui\common\config-manager.h"\
-	"..\..\..\gui\common\scaler.h"\
-	"..\..\..\gui\gui\browser.h"\
-	"..\..\..\gui\gui\chooser.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\options.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
-	"..\..\..\gui\sound\mididrv.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_OPTIO=\
 	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\gameDetector.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\browser.h"\
 	"..\..\..\gui\chooser.h"\
 	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\ListWidget.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\options.h"\
@@ -9661,42 +4027,45 @@ DEP_CPP_OPTIO=\
 	"..\..\..\gui\TabWidget.h"\
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_OPTIO=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_OPTIO=\
 	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\wince\CEKeysDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\gameDetector.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\browser.h"\
 	"..\..\..\gui\chooser.h"\
 	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\ListWidget.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\options.h"\
@@ -9704,9 +4073,10 @@ DEP_CPP_OPTIO=\
 	"..\..\..\gui\TabWidget.h"\
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
+	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_OPTIO=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -9715,254 +4085,16 @@ NODEP_CPP_OPTIO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_OPTIO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_OPTIO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_OPTIO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_OPTIO=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_OPTIO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_OPTIO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_OPTIO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_OPTIO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_OPTIO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_OPTIO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_OPTIO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\chooser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\options.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\mididrv.h"\
-	
-NODEP_CPP_OPTIO=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -9976,55 +4108,36 @@ SOURCE=..\..\..\gui\PopUpWidget.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_POPUP=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_POPUP=\
-	"..\..\..\gui\base\engine.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\PopUpWidget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_POPUP=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\PopUpWidget.h"\
 	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_POPUP=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -10035,17 +4148,14 @@ DEP_CPP_POPUP=\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
@@ -10054,7 +4164,7 @@ DEP_CPP_POPUP=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_POPUP=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -10062,188 +4172,16 @@ NODEP_CPP_POPUP=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_POPUP=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_POPUP=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_POPUP=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_POPUP=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_POPUP=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_POPUP=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_POPUP=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_POPUP=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_POPUP=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_POPUP=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_POPUP=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\PopUpWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_POPUP=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -10257,28 +4195,8 @@ SOURCE=..\..\..\gui\ScrollBarWidget.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SCROL=\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	
-NODEP_CPP_SCROL=\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SCROL=\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	
-NODEP_CPP_SCROL=\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SCROL=\
@@ -10286,28 +4204,26 @@ DEP_CPP_SCROL=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\ScrollBarWidget.h"\
 	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -10317,17 +4233,14 @@ DEP_CPP_SCROL=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
@@ -10336,7 +4249,7 @@ DEP_CPP_SCROL=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_SCROL=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -10344,182 +4257,16 @@ NODEP_CPP_SCROL=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCROL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_SCROL=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCROL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_SCROL=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCROL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_SCROL=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCROL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_SCROL=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCROL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_SCROL=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCROL=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\ScrollBarWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_SCROL=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -10533,24 +4280,8 @@ SOURCE=..\..\..\gui\TabWidget.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_TABWI=\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_TABWI=\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\TabWidget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_TABWI=\
@@ -10558,28 +4289,26 @@ DEP_CPP_TABWI=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\TabWidget.h"\
 	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_TABWI=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -10589,17 +4318,14 @@ DEP_CPP_TABWI=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
@@ -10608,7 +4334,7 @@ DEP_CPP_TABWI=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_TABWI=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -10616,182 +4342,16 @@ NODEP_CPP_TABWI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_TABWI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_TABWI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_TABWI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_TABWI=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_TABWI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_TABWI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_TABWI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_TABWI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_TABWI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_TABWI=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_TABWI=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\TabWidget.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_TABWI=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -10805,24 +4365,8 @@ SOURCE=..\..\..\gui\widget.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_WIDGE=\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_WIDGE=\
-	"..\..\..\gui\common\util.h"\
-	"..\..\..\gui\gui\dialog.h"\
-	"..\..\..\gui\gui\newgui.h"\
-	"..\..\..\gui\gui\widget.h"\
-	"..\..\..\gui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_WIDGE=\
@@ -10830,27 +4374,25 @@ DEP_CPP_WIDGE=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -10860,17 +4402,14 @@ DEP_CPP_WIDGE=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\newgui.h"\
@@ -10878,7 +4417,7 @@ DEP_CPP_WIDGE=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_WIDGE=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -10886,176 +4425,16 @@ NODEP_CPP_WIDGE=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_WIDGE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_WIDGE=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_WIDGE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_WIDGE=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_WIDGE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_WIDGE=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_WIDGE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_WIDGE=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_WIDGE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_WIDGE=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_WIDGE=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_WIDGE=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\graphics\font.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -11127,24 +4506,8 @@ SOURCE=..\..\..\backends\wince\missing\missing.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MISSI=\
@@ -11163,62 +4526,16 @@ DEP_CPP_MISSI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\dirent.h"\
-	"..\..\..\backends\wince\missing\sys\time.h"\
-	
-NODEP_CPP_MISSI=\
-	"..\..\..\backends\wince\missing\portdefs.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -11247,34 +4564,8 @@ SOURCE=..\..\..\backends\wince\CEgui\GUIElement.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_GUIEL=\
@@ -11285,65 +4576,17 @@ DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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_GUIEL=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_GUIEL=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -11370,45 +4613,7 @@ NODEP_CPP_GUIEL=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -11418,18 +4623,17 @@ DEP_CPP_GUIEL=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_GUIEL=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -11456,158 +4660,18 @@ NODEP_CPP_GUIEL=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_GUIEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -11621,42 +4685,8 @@ SOURCE=..\..\..\backends\wince\CEgui\Panel.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_PANEL=\
@@ -11669,67 +4699,17 @@ DEP_CPP_PANEL=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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_PANEL=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_PANEL=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -11756,47 +4736,7 @@ NODEP_CPP_PANEL=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_PANEL=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -11808,18 +4748,17 @@ DEP_CPP_PANEL=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_PANEL=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -11846,166 +4785,18 @@ NODEP_CPP_PANEL=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANEL=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -12019,34 +4810,8 @@ SOURCE=..\..\..\backends\wince\CEgui\PanelItem.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	
-NODEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	
-NODEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_PANELI=\
@@ -12058,66 +4823,17 @@ DEP_CPP_PANELI=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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_PANELI=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_PANELI=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -12144,46 +4860,7 @@ NODEP_CPP_PANELI=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_PANELI=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -12194,18 +4871,17 @@ DEP_CPP_PANELI=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_PANELI=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -12232,162 +4908,18 @@ NODEP_CPP_PANELI=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELI=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -12401,91 +4933,24 @@ SOURCE=..\..\..\backends\wince\CEgui\SDL_ImageResource.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	
-NODEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	
-NODEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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_SDL_I=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_SDL_I=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -12512,57 +4977,22 @@ NODEP_CPP_SDL_I=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	
-NODEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_SDL_I=\
 	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_SDL_I=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -12589,142 +5019,18 @@ NODEP_CPP_SDL_I=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	
-NODEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	
-NODEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	
-NODEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	
-NODEP_CPP_SDL_I=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -12738,32 +5044,8 @@ SOURCE=..\..\..\backends\wince\CEgui\Toolbar.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_TOOLB=\
@@ -12774,65 +5056,17 @@ DEP_CPP_TOOLB=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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_TOOLB=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_TOOLB=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -12859,45 +5093,7 @@ NODEP_CPP_TOOLB=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_TOOLB=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -12907,18 +5103,17 @@ DEP_CPP_TOOLB=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_TOOLB=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -12945,158 +5140,18 @@ NODEP_CPP_TOOLB=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_TOOLB=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -13110,34 +5165,8 @@ SOURCE=..\..\..\backends\wince\CEgui\ToolbarHandler.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\string.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\string.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_TOOLBA=\
@@ -13149,66 +5178,17 @@ DEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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_TOOLBA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_TOOLBA=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -13235,46 +5215,7 @@ NODEP_CPP_TOOLBA=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -13285,18 +5226,17 @@ DEP_CPP_TOOLBA=\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_TOOLBA=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -13323,162 +5263,18 @@ NODEP_CPP_TOOLBA=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	
-NODEP_CPP_TOOLBA=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -13496,30 +5292,8 @@ SOURCE=..\..\..\backends\wince\CEgui\ItemAction.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_ITEMA=\
@@ -13548,88 +5322,19 @@ DEP_CPP_ITEMA=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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"\
-	
-NODEP_CPP_ITEMA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_ITEMA=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -13657,20 +5362,7 @@ NODEP_CPP_ITEMA=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_ITEMA=\
 	"..\..\..\backends\intern.h"\
@@ -13698,20 +5390,19 @@ DEP_CPP_ITEMA=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_ITEMA=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -13739,58 +5430,18 @@ NODEP_CPP_ITEMA=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	
-NODEP_CPP_ITEMA=\
-	"..\..\..\backends\wince\CEgui\CEActions.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -13804,44 +5455,8 @@ SOURCE=..\..\..\backends\wince\CEgui\ItemSwitch.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_ITEMS=\
@@ -13858,71 +5473,17 @@ DEP_CPP_ITEMS=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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_ITEMS=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_ITEMS=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -13949,49 +5510,7 @@ NODEP_CPP_ITEMS=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -14007,18 +5526,17 @@ DEP_CPP_ITEMS=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_ITEMS=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -14045,174 +5563,18 @@ NODEP_CPP_ITEMS=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_ITEMS=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -14226,38 +5588,8 @@ SOURCE=..\..\..\backends\wince\CEgui\PanelKeyboard.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysQueue.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysQueue.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_PANELK=\
@@ -14272,69 +5604,17 @@ DEP_CPP_PANELK=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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_PANELK=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_PANELK=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -14361,47 +5641,7 @@ NODEP_CPP_PANELK=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_PANELK=\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -14415,18 +5655,17 @@ DEP_CPP_PANELK=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_PANELK=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -14453,166 +5692,18 @@ NODEP_CPP_PANELK=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	
-NODEP_CPP_PANELK=\
-	"..\..\..\backends\wince\CEgui\common\map.h"\
-	"..\..\..\backends\wince\CEgui\common\scummsys.h"\
-	"..\..\..\backends\wince\CEgui\common\stdafx.h"\
-	"..\..\..\backends\wince\CEgui\common\str.h"\
-	"..\..\..\backends\wince\CEgui\common\system.h"\
-	"..\..\..\backends\wince\CEgui\KeysBuffer.h"\
-	"..\..\..\backends\wince\CEgui\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -14639,32 +5730,8 @@ SOURCE=..\..\..\backends\wince\CEkeys\EventsBuffer.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	
-NODEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\common\list.h"\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	
-NODEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\common\list.h"\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_EVENT=\
@@ -14673,61 +5740,16 @@ DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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_EVENT=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -14754,7 +5776,7 @@ NODEP_CPP_EVENT=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
@@ -14762,16 +5784,18 @@ DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_EVENT=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -14796,175 +5820,18 @@ NODEP_CPP_EVENT=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_EVENT=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_EVENT=\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_EVENT=\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_EVENT=\
-	"..\..\..\common\extend.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_EVENT=\
-	"..\..\..\common\extend.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -14978,47 +5845,27 @@ SOURCE=..\..\..\backends\wince\CEkeys\Key.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	
-NODEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	
-NODEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_KEY_C=\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_KEY_C=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -15027,17 +5874,16 @@ DEP_CPP_KEY_C=\
 	"..\..\..\backends\wince\CEkeys\Key.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_KEY_C=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -15045,86 +5891,16 @@ NODEP_CPP_KEY_C=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	
-NODEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_KEY_C=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	
-NODEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	
-NODEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	
-NODEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	
-NODEP_CPP_KEY_C=\
-	"..\..\..\backends\wince\CEkeys\common\scummsys.h"\
-	"..\..\..\backends\wince\CEkeys\common\stdafx.h"\
-	"..\..\..\backends\wince\CEkeys\common\system.h"\
-	"..\..\..\backends\wince\CEkeys\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -15139,52 +5915,8 @@ SOURCE=..\..\..\backends\wince\CEActions.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CEACT=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACT=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CEACT=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACT=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CEACT=\
@@ -15217,8 +5949,8 @@ DEP_CPP_CEACT=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -15228,7 +5960,6 @@ DEP_CPP_CEACT=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
@@ -15236,89 +5967,10 @@ DEP_CPP_CEACT=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\script.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\wiz_he.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"\
-	
-NODEP_CPP_CEACT=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_CEACT=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\util.h"\
 	
 NODEP_CPP_CEACT=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -15346,58 +5998,7 @@ NODEP_CPP_CEACT=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CEACT=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACT=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_CEACT=\
 	"..\..\..\backends\intern.h"\
@@ -15429,8 +6030,8 @@ DEP_CPP_CEACT=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -15440,7 +6041,6 @@ DEP_CPP_CEACT=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
@@ -15448,9 +6048,10 @@ DEP_CPP_CEACT=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\script.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\util.h"\
 	
 NODEP_CPP_CEACT=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -15478,210 +6079,18 @@ NODEP_CPP_CEACT=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CEACT=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACT=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CEACT=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACT=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CEACT=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACT=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CEACT=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACT=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -15695,64 +6104,8 @@ SOURCE=..\..\..\backends\wince\CEActionsPocket.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CEACTI=\
@@ -15784,8 +6137,8 @@ DEP_CPP_CEACTI=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -15795,7 +6148,6 @@ DEP_CPP_CEACTI=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
@@ -15803,165 +6155,12 @@ DEP_CPP_CEACTI=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\script.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\wiz_he.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"\
+	"..\..\..\scumm\util.h"\
 	
 NODEP_CPP_CEACTI=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_CEACTI=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTI=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CEACTI=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.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\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTI=\
-	"..\..\..\common\extend.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -15987,7 +6186,7 @@ NODEP_CPP_CEACTI=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_CEACTI=\
 	"..\..\..\backends\intern.h"\
@@ -16018,8 +6217,8 @@ DEP_CPP_CEACTI=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -16029,7 +6228,6 @@ DEP_CPP_CEACTI=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
@@ -16037,9 +6235,10 @@ DEP_CPP_CEACTI=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\script.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\util.h"\
 	
 NODEP_CPP_CEACTI=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -16067,264 +6266,18 @@ NODEP_CPP_CEACTI=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CEACTI=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.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\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTI=\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CEACTI=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.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\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTI=\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CEACTI=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.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\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CEACTI=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.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\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTI=\
-	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -16338,71 +6291,15 @@ SOURCE=..\..\..\backends\wince\CEActionsSmartphone.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CEACTIO=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -16427,8 +6324,8 @@ DEP_CPP_CEACTIO=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -16438,7 +6335,6 @@ DEP_CPP_CEACTIO=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
@@ -16446,90 +6342,10 @@ DEP_CPP_CEACTIO=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\script.h"\
 	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\wiz_he.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"\
-	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\util.h"\
 	
 NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -16557,89 +6373,13 @@ NODEP_CPP_CEACTIO=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.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\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_CEACTIO=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
+	"..\..\..\backends\wince\CEActionsSmartphone.h"\
 	"..\..\..\backends\wince\CEDevice.h"\
 	"..\..\..\backends\wince\CEgui\CEGUI.h"\
 	"..\..\..\backends\wince\CEgui\GUIElement.h"\
@@ -16664,8 +6404,8 @@ DEP_CPP_CEACTIO=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -16675,7 +6415,6 @@ DEP_CPP_CEACTIO=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\message.h"\
@@ -16683,10 +6422,10 @@ DEP_CPP_CEACTIO=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\script.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\util.h"\
 	
 NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -16714,266 +6453,18 @@ NODEP_CPP_CEACTIO=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.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\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.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\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.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\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CEACTIO=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.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\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	
-NODEP_CPP_CEACTIO=\
-	"..\..\..\backends\wince\CEgui\ItemSendKey.h"\
-	"..\..\..\backends\wince\CEgui\SDL.h"\
-	"..\..\..\backends\wince\CEkeys\KeysBuffer.h"\
-	"..\..\..\common\extend.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -16987,28 +6478,8 @@ SOURCE=..\..\..\backends\wince\CEDevice.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CEDEV=\
@@ -17034,85 +6505,19 @@ DEP_CPP_CEDEV=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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"\
-	
-NODEP_CPP_CEDEV=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_CEDEV=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -17140,21 +6545,7 @@ NODEP_CPP_CEDEV=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_CEDEV=\
 	"..\..\..\backends\intern.h"\
@@ -17179,20 +6570,19 @@ DEP_CPP_CEDEV=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_CEDEV=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -17220,62 +6610,18 @@ NODEP_CPP_CEDEV=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\CEDevice.h"\
-	
-NODEP_CPP_CEDEV=\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -17289,16 +6635,8 @@ SOURCE=..\..\..\backends\wince\CEException.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CEEXC=\
@@ -17313,40 +6651,16 @@ DEP_CPP_CEEXC=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CEEXC=\
-	"..\..\..\backends\wince\CEException.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -17360,62 +6674,8 @@ SOURCE=..\..\..\backends\wince\CEKeysDialog.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\x.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CEKEY=\
@@ -17444,85 +6704,8 @@ DEP_CPP_CEKEY=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.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"\
-	
-NODEP_CPP_CEKEY=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -17530,11 +6713,10 @@ DEP_CPP_CEKEY=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\ListWidget.h"\
@@ -17543,7 +6725,7 @@ DEP_CPP_CEKEY=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_CEKEY=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -17571,58 +6753,7 @@ NODEP_CPP_CEKEY=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_CEKEY=\
 	"..\..\..\backends\intern.h"\
@@ -17650,8 +6781,8 @@ DEP_CPP_CEKEY=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -17659,11 +6790,10 @@ DEP_CPP_CEKEY=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\ListWidget.h"\
@@ -17672,7 +6802,7 @@ DEP_CPP_CEKEY=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_CEKEY=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -17700,210 +6830,18 @@ NODEP_CPP_CEKEY=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_CEKEY=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\x.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -17917,38 +6855,8 @@ SOURCE=..\..\..\backends\wince\CELauncherDialog.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CELAU=\
@@ -17980,8 +6888,8 @@ DEP_CPP_CELAU=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -17989,11 +6897,10 @@ DEP_CPP_CELAU=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\browser.h"\
 	"..\..\..\gui\dialog.h"\
@@ -18002,91 +6909,9 @@ DEP_CPP_CELAU=\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
 	"..\..\..\gui\widget.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"\
 	
 NODEP_CPP_CELAU=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_CELAU=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\browser.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -18114,24 +6939,7 @@ NODEP_CPP_CELAU=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_CELAU=\
 	"..\..\..\backends\fs\fs.h"\
@@ -18162,8 +6970,8 @@ DEP_CPP_CELAU=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -18171,11 +6979,10 @@ DEP_CPP_CELAU=\
 	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\browser.h"\
 	"..\..\..\gui\dialog.h"\
@@ -18186,7 +6993,7 @@ DEP_CPP_CELAU=\
 	"..\..\..\gui\widget.h"\
 	
 NODEP_CPP_CELAU=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -18214,74 +7021,18 @@ NODEP_CPP_CELAU=\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CELAU=\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	
-NODEP_CPP_CELAU=\
-	"..\..\..\backends\wince\backends\fs\fs.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\gui\browser.h"\
-	"..\..\..\backends\wince\gui\launcher.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -18295,53 +7046,29 @@ SOURCE=..\..\..\backends\wince\CEScaler.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
-	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
-	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_CESCA=\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_CESCA=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -18350,19 +7077,18 @@ DEP_CPP_CESCA=\
 	"..\..\..\backends\wince\CEScaler.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_CESCA=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -18370,98 +7096,16 @@ NODEP_CPP_CESCA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
-	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_CESCA=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
-	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
-	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
-	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_CESCA=\
-	"..\..\..\backends\wince\CEScaler.h"\
-	
-NODEP_CPP_CESCA=\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -18479,60 +7123,8 @@ SOURCE="..\..\..\backends\wince\wince-sdl.cpp"
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_WINCE=\
@@ -18570,107 +7162,8 @@ DEP_CPP_WINCE=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scaler\intern.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\ListWidget.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\scumm\gfx.h"\
-	"..\..\..\scumm\script.h"\
-	"..\..\..\scumm\scumm.h"\
-	"..\..\..\scumm\wiz_he.h"\
-	"..\..\..\sound\fmopl.h"\
-	{$(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)}"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\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_WINCE=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEActionsPocket.h"\
-	"..\..\..\backends\wince\CEActionsSmartphone.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEException.h"\
-	"..\..\..\backends\wince\CEgui\CEGUI.h"\
-	"..\..\..\backends\wince\CEgui\GUIElement.h"\
-	"..\..\..\backends\wince\CEgui\ItemAction.h"\
-	"..\..\..\backends\wince\CEgui\ItemSwitch.h"\
-	"..\..\..\backends\wince\CEgui\Panel.h"\
-	"..\..\..\backends\wince\CEgui\PanelItem.h"\
-	"..\..\..\backends\wince\CEgui\PanelKeyboard.h"\
-	"..\..\..\backends\wince\CEgui\SDL_ImageResource.h"\
-	"..\..\..\backends\wince\CEgui\Toolbar.h"\
-	"..\..\..\backends\wince\CEgui\ToolbarHandler.h"\
-	"..\..\..\backends\wince\CEkeys\CEKeys.h"\
-	"..\..\..\backends\wince\CEkeys\EventsBuffer.h"\
-	"..\..\..\backends\wince\CEkeys\Key.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\ozone.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -18682,8 +7175,8 @@ DEP_CPP_WINCE=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\ListWidget.h"\
@@ -18694,10 +7187,12 @@ DEP_CPP_WINCE=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\script.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\util.h"\
 	"..\..\..\sound\fmopl.h"\
 	
 NODEP_CPP_WINCE=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\..\..\..\PROGRAM FILES\WINDOWS CE TOOLS\WCE420\POCKET PC 2003\INCLUDE\ARMV4\ogg\config_types.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -18722,80 +7217,15 @@ NODEP_CPP_WINCE=\
 	".\DL_version.h"\
 	".\DL_video.h"\
 	".\egin_code.h"\
+	".\gg\ogg.h"\
+	".\gg\os_types.h"\
 	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
+	".\orbis\codec.h"\
 	".\orbis\vorbisfile.h"\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_WINCE=\
 	"..\..\..\backends\intern.h"\
@@ -18832,8 +7262,8 @@ DEP_CPP_WINCE=\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\list.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scaler\intern.h"\
 	"..\..\..\common\scummsys.h"\
@@ -18845,8 +7275,8 @@ DEP_CPP_WINCE=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\ListWidget.h"\
@@ -18857,10 +7287,12 @@ DEP_CPP_WINCE=\
 	"..\..\..\scumm\gfx.h"\
 	"..\..\..\scumm\script.h"\
 	"..\..\..\scumm\scumm.h"\
+	"..\..\..\scumm\util.h"\
 	"..\..\..\sound\fmopl.h"\
 	
 NODEP_CPP_WINCE=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\..\..\..\PROGRAM FILES\WINDOWS CE TOOLS\WCE420\POCKET PC 2003\INCLUDE\ARMV4\ogg\config_types.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -18885,271 +7317,26 @@ NODEP_CPP_WINCE=\
 	".\DL_version.h"\
 	".\DL_video.h"\
 	".\egin_code.h"\
+	".\gg\ogg.h"\
+	".\gg\os_types.h"\
 	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
+	".\orbis\codec.h"\
 	".\orbis\vorbisfile.h"\
 	".\x.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_WINCE=\
-	"..\..\..\backends\wince\CEActions.h"\
-	"..\..\..\backends\wince\CEDevice.h"\
-	"..\..\..\backends\wince\CEKeysDialog.h"\
-	"..\..\..\backends\wince\CEScaler.h"\
-	"..\..\..\backends\wince\wince-sdl.h"\
-	
-NODEP_CPP_WINCE=\
-	"..\..\..\backends\wince\backends\intern.h"\
-	"..\..\..\backends\wince\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\base\engine.h"\
-	"..\..\..\backends\wince\base\gameDetector.h"\
-	"..\..\..\backends\wince\base\plugins.h"\
-	"..\..\..\backends\wince\CEgui.h"\
-	"..\..\..\backends\wince\CEkeys.h"\
-	"..\..\..\backends\wince\common\config-manager.h"\
-	"..\..\..\backends\wince\common\scaler.h"\
-	"..\..\..\backends\wince\common\scaler\intern.h"\
-	"..\..\..\backends\wince\common\scummsys.h"\
-	"..\..\..\backends\wince\common\stdafx.h"\
-	"..\..\..\backends\wince\common\str.h"\
-	"..\..\..\backends\wince\common\system.h"\
-	"..\..\..\backends\wince\common\timer.h"\
-	"..\..\..\backends\wince\common\util.h"\
-	"..\..\..\backends\wince\gui\dialog.h"\
-	"..\..\..\backends\wince\gui\ListWidget.h"\
-	"..\..\..\backends\wince\gui\message.h"\
-	"..\..\..\backends\wince\gui\newgui.h"\
-	"..\..\..\backends\wince\ItemAction.h"\
-	"..\..\..\backends\wince\Key.h"\
-	"..\..\..\backends\wince\scumm\scumm.h"\
-	"..\..\..\backends\wince\sound\fmopl.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	".\orbis\config_types.h"\
-	".\orbis\ivorbiscodec.h"\
-	".\orbis\ogg.h"\
-	".\orbis\os_types.h"\
-	".\orbis\vorbisfile.h"\
-	".\x.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -19170,24 +7357,8 @@ SOURCE="..\..\..\backends\fs\windows\windows-fs.cpp"
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_WINDO=\
@@ -19198,12 +7369,12 @@ DEP_CPP_WINDO=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WINDO=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -19216,10 +7387,9 @@ DEP_CPP_WINDO=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_WINDO=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -19227,78 +7397,16 @@ NODEP_CPP_WINDO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_WINDO=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_WINDO=\
-	"..\..\..\backends\fs\common\list.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\windows\stdafx.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -19309,26 +7417,8 @@ SOURCE=..\..\..\backends\fs\fs.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-DEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\common\array.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-DEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\fs.h"\
-	
-NODEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\common\array.h"\
-	"..\..\..\backends\fs\common\str.h"\
-	"..\..\..\backends\fs\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_FS_CP=\
@@ -19339,12 +7429,13 @@ DEP_CPP_FS_CP=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\util.h"\
 	
 NODEP_CPP_FS_CP=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -19357,12 +7448,13 @@ DEP_CPP_FS_CP=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\common\util.h"\
 	
 NODEP_CPP_FS_CP=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -19375,38 +7467,8 @@ NODEP_CPP_FS_CP=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_FS_CP=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_FS_CP=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_FS_CP=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -19420,252 +7482,12 @@ SOURCE=..\..\..\backends\fs\fs.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\backends\midi\adlib.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-DEP_CPP_ADLIB=\
-	"..\..\..\backends\midi\emumidi.h"\
-	
-NODEP_CPP_ADLIB=\
-	"..\..\..\backends\midi\common\util.h"\
-	"..\..\..\backends\midi\sound\audiostream.h"\
-	"..\..\..\backends\midi\sound\fmopl.h"\
-	"..\..\..\backends\midi\sound\mididrv.h"\
-	"..\..\..\backends\midi\sound\mixer.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-DEP_CPP_ADLIB=\
-	"..\..\..\backends\midi\emumidi.h"\
-	
-NODEP_CPP_ADLIB=\
-	"..\..\..\backends\midi\common\util.h"\
-	"..\..\..\backends\midi\sound\audiostream.h"\
-	"..\..\..\backends\midi\sound\fmopl.h"\
-	"..\..\..\backends\midi\sound\mididrv.h"\
-	"..\..\..\backends\midi\sound\mixer.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_ADLIB=\
-	"..\..\..\backends\midi\emumidi.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_ADLIB=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_ADLIB=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ADLIB=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_ADLIB=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ADLIB=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-DEP_CPP_ADLIB=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ADLIB=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_ADLIB=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ADLIB=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-DEP_CPP_ADLIB=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ADLIB=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_ADLIB=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ADLIB=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_ADLIB=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\fmopl.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ADLIB=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 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"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !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"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_ALSA_=\
@@ -19674,25 +7496,23 @@ DEP_CPP_ALSA_=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ALSA_=\
+	"..\..\..\backends\midi\config.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -19703,22 +7523,19 @@ DEP_CPP_ALSA_=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
 	
 NODEP_CPP_ALSA_=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\backends\midi\config.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -19727,164 +7544,16 @@ NODEP_CPP_ALSA_=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_ALSA_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ALSA_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_ALSA_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_ALSA_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_ALSA_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_ALSA_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_ALSA_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -19894,20 +7563,8 @@ SOURCE=..\..\..\backends\midi\coreaudio.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_COREA=\
-	"..\..\..\backends\midi\common\config-manager.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_COREA=\
-	"..\..\..\backends\midi\common\config-manager.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_COREA=\
@@ -19916,25 +7573,22 @@ DEP_CPP_COREA=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_COREA=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -19945,22 +7599,18 @@ DEP_CPP_COREA=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
 	
 NODEP_CPP_COREA=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -19969,164 +7619,16 @@ NODEP_CPP_COREA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_COREA=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_COREA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_COREA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_COREA=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_COREA=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_COREA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_COREA=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_COREA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_COREA=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_COREA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_COREA=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_COREA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -20136,48 +7638,29 @@ SOURCE=..\..\..\backends\midi\morphos.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MORPH=\
-	"..\..\..\backends\midi\common\util.h"\
-	"..\..\..\backends\midi\morphos.h"\
-	"..\..\..\backends\midi\morphos_sound.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MORPH=\
-	"..\..\..\backends\midi\common\util.h"\
-	"..\..\..\backends\midi\morphos.h"\
-	"..\..\..\backends\midi\morphos_sound.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MORPH=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_MORPH=\
 	"..\..\..\backends\midi\morphos.h"\
 	"..\..\..\backends\midi\morphos_sound.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -20185,22 +7668,18 @@ NODEP_CPP_MORPH=\
 DEP_CPP_MORPH=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
 	
 NODEP_CPP_MORPH=\
 	"..\..\..\backends\midi\morphos.h"\
 	"..\..\..\backends\midi\morphos_sound.h"\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -20209,146 +7688,16 @@ NODEP_CPP_MORPH=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MORPH=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MORPH=\
-	"..\..\..\backends\midi\morphos.h"\
-	"..\..\..\backends\midi\morphos_sound.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_MORPH=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MORPH=\
-	"..\..\..\backends\midi\morphos.h"\
-	"..\..\..\backends\midi\morphos_sound.h"\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MORPH=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MORPH=\
-	"..\..\..\backends\midi\morphos.h"\
-	"..\..\..\backends\midi\morphos_sound.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MORPH=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MORPH=\
-	"..\..\..\backends\midi\morphos.h"\
-	"..\..\..\backends\midi\morphos_sound.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MORPH=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MORPH=\
-	"..\..\..\backends\midi\morphos.h"\
-	"..\..\..\backends\midi\morphos_sound.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MORPH=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_MORPH=\
-	"..\..\..\backends\midi\morphos.h"\
-	"..\..\..\backends\midi\morphos_sound.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -20358,40 +7707,26 @@ SOURCE=..\..\..\backends\midi\null.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_NULL_=\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_NULL_=\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_NULL_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NULL_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -20399,20 +7734,15 @@ NODEP_CPP_NULL_=\
 DEP_CPP_NULL_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
 	
 NODEP_CPP_NULL_=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -20421,129 +7751,16 @@ NODEP_CPP_NULL_=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_NULL_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_NULL_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_NULL_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_NULL_=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_NULL_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_NULL_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_NULL_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_NULL_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_NULL_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_NULL_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_NULL_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_NULL_=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -20553,40 +7770,27 @@ SOURCE=..\..\..\backends\midi\quicktime.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_QUICK=\
-	"..\..\..\backends\midi\common\util.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_QUICK=\
-	"..\..\..\backends\midi\common\util.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_QUICK=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_QUICK=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -20594,20 +7798,16 @@ NODEP_CPP_QUICK=\
 DEP_CPP_QUICK=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
 	
 NODEP_CPP_QUICK=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -20616,134 +7816,16 @@ NODEP_CPP_QUICK=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_QUICK=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_QUICK=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_QUICK=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_QUICK=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_QUICK=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_QUICK=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_QUICK=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_QUICK=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_QUICK=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_QUICK=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_QUICK=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_QUICK=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -20753,42 +7835,27 @@ SOURCE=..\..\..\backends\midi\seq.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SEQ_C=\
-	"..\..\..\backends\midi\common\util.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SEQ_C=\
-	"..\..\..\backends\midi\common\util.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SEQ_C=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SEQ_C=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -20796,20 +7863,16 @@ NODEP_CPP_SEQ_C=\
 DEP_CPP_SEQ_C=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
 	
 NODEP_CPP_SEQ_C=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -20818,134 +7881,16 @@ NODEP_CPP_SEQ_C=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SEQ_C=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_SEQ_C=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SEQ_C=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_SEQ_C=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SEQ_C=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_SEQ_C=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SEQ_C=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_SEQ_C=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SEQ_C=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_SEQ_C=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SEQ_C=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_SEQ_C=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -20955,42 +7900,27 @@ SOURCE=..\..\..\backends\midi\windows.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_WINDOW=\
-	"..\..\..\backends\midi\common\util.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_WINDOW=\
-	"..\..\..\backends\midi\common\util.h"\
-	"..\..\..\backends\midi\sound\mpu401.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_WINDOW=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_WINDOW=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -20998,20 +7928,16 @@ NODEP_CPP_WINDOW=\
 DEP_CPP_WINDOW=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mpu401.h"\
 	
 NODEP_CPP_WINDOW=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -21020,346 +7946,16 @@ NODEP_CPP_WINDOW=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_WINDOW=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_WINDOW=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_WINDOW=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_WINDOW=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_WINDOW=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_WINDOW=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_WINDOW=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_WINDOW=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_WINDOW=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_WINDOW=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_WINDOW=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mpu401.h"\
-	
-NODEP_CPP_WINDOW=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\backends\midi\ym2612.cpp
-
-!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
-
-DEP_CPP_YM261=\
-	"..\..\..\backends\midi\emumidi.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\backends\midi\sound\audiostream.h"\
-	"..\..\..\backends\midi\sound\mididrv.h"\
-	"..\..\..\backends\midi\sound\mixer.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
-
-DEP_CPP_YM261=\
-	"..\..\..\backends\midi\emumidi.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\backends\midi\sound\audiostream.h"\
-	"..\..\..\backends\midi\sound\mididrv.h"\
-	"..\..\..\backends\midi\sound\mixer.h"\
-	"..\..\..\backends\midi\stdafx.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_YM261=\
-	"..\..\..\backends\midi\emumidi.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_YM261=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_YM261=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
-
-DEP_CPP_YM261=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_YM261=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
-
-DEP_CPP_YM261=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
-
-DEP_CPP_YM261=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
-
-DEP_CPP_YM261=\
-	"..\..\..\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"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_YM261=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -21373,18 +7969,8 @@ SOURCE=..\..\..\backends\sdl\events.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_EVENTS=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_EVENTS=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_EVENTS=\
@@ -21392,62 +7978,17 @@ DEP_CPP_EVENTS=\
 	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.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_EVENTS=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_EVENTS=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -21474,24 +8015,26 @@ NODEP_CPP_EVENTS=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_EVENTS=\
 	"..\..\..\backends\intern.h"\
 	"..\..\..\backends\sdl\sdl-common.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_EVENTS=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -21516,173 +8059,18 @@ NODEP_CPP_EVENTS=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_EVENTS=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_EVENTS=\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_EVENTS=\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_EVENTS=\
-	"..\..\..\common\extend.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_EVENTS=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_EVENTS=\
-	"..\..\..\common\extend.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -21692,22 +8080,8 @@ SOURCE=..\..\..\backends\sdl\graphics.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_GRAPH=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\scaler.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	"..\..\..\backends\sdl\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_GRAPH=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\scaler.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	"..\..\..\backends\sdl\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_GRAPH=\
@@ -21716,69 +8090,21 @@ DEP_CPP_GRAPH=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.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_GRAPH=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_GRAPH=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -21805,52 +8131,7 @@ NODEP_CPP_GRAPH=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_GRAPH=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\font.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_GRAPH=\
 	"..\..\..\backends\intern.h"\
@@ -21858,21 +8139,21 @@ DEP_CPP_GRAPH=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_GRAPH=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -21899,134 +8180,18 @@ NODEP_CPP_GRAPH=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_GRAPH=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\font.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_GRAPH=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\gui\font.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_GRAPH=\
-	"..\..\..\common\extend.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_GRAPH=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_GRAPH=\
-	"..\..\..\common\extend.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -22040,24 +8205,8 @@ SOURCE=..\..\..\backends\sdl\sdl.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SDL_C=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\config-manager.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	"..\..\..\backends\sdl\config.h"\
-	"..\..\..\backends\sdl\scummvm.xpm"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SDL_C=\
-	"..\..\..\backends\sdl\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\sdl\common\config-manager.h"\
-	"..\..\..\backends\sdl\common\util.h"\
-	"..\..\..\backends\sdl\config.h"\
-	"..\..\..\backends\sdl\scummvm.xpm"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SDL_C=\
@@ -22068,121 +8217,22 @@ DEP_CPP_SDL_C=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\scummvm.xpm"\
-	{$(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_SDL_C=\
+	"..\..\..\backends\sdl\config.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\scummvm.xpm"\
-	
-NODEP_CPP_SDL_C=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\scummvm.xpm"\
-	
-NODEP_CPP_SDL_C=\
-	"..\..\..\common\extend.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -22207,7 +8257,7 @@ NODEP_CPP_SDL_C=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_SDL_C=\
 	"..\..\..\backends\intern.h"\
@@ -22217,21 +8267,20 @@ DEP_CPP_SDL_C=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\scummvm.xpm"\
 	
 NODEP_CPP_SDL_C=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\backends\sdl\config.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL.h"\
@@ -22258,152 +8307,18 @@ NODEP_CPP_SDL_C=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\scummvm.xpm"\
-	
-NODEP_CPP_SDL_C=\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\scummvm.xpm"\
-	
-NODEP_CPP_SDL_C=\
-	"..\..\..\common\extend.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\scummvm.xpm"\
-	
-NODEP_CPP_SDL_C=\
-	"..\..\..\common\extend.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SDL_C=\
-	"..\..\..\backends\intern.h"\
-	"..\..\..\backends\sdl\sdl-common.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\scummvm.xpm"\
-	
-NODEP_CPP_SDL_C=\
-	"..\..\..\common\extend.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -22422,28 +8337,8 @@ SOURCE=..\..\..\base\engine.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ENGIN=\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\common\file.h"\
-	"..\..\..\base\common\scaler.h"\
-	"..\..\..\base\common\timer.h"\
-	"..\..\..\base\sound\mixer.h"\
-	"..\..\..\base\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ENGIN=\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\common\file.h"\
-	"..\..\..\base\common\scaler.h"\
-	"..\..\..\base\common\timer.h"\
-	"..\..\..\base\sound\mixer.h"\
-	"..\..\..\base\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_ENGIN=\
@@ -22455,6 +8350,7 @@ DEP_CPP_ENGIN=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scaler.h"\
@@ -22466,14 +8362,14 @@ DEP_CPP_ENGIN=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ENGIN=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -22487,8 +8383,10 @@ DEP_CPP_ENGIN=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -22497,11 +8395,10 @@ DEP_CPP_ENGIN=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_ENGIN=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -22510,181 +8407,16 @@ NODEP_CPP_ENGIN=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_ENGIN=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ENGIN=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_ENGIN=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ENGIN=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_ENGIN=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ENGIN=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ENGIN=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ENGIN=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ENGIN=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ENGIN=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ENGIN=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ENGIN=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -22698,32 +8430,8 @@ SOURCE=..\..\..\base\gameDetector.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_GAMED=\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\gameDetector.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\base\version.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\config.h"\
-	"..\..\..\base\sound\mididrv.h"\
-	"..\..\..\base\sound\mixer.h"\
-	"..\..\..\base\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_GAMED=\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\gameDetector.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\base\version.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\config.h"\
-	"..\..\..\base\sound\mididrv.h"\
-	"..\..\..\base\sound\mixer.h"\
-	"..\..\..\base\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_GAMED=\
@@ -22736,25 +8444,25 @@ DEP_CPP_GAMED=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_GAMED=\
+	"..\..\..\base\config.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -22769,23 +8477,21 @@ DEP_CPP_GAMED=\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_GAMED=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\base\config.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -22794,189 +8500,16 @@ NODEP_CPP_GAMED=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_GAMED=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_GAMED=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_GAMED=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_GAMED=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_GAMED=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_GAMED=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_GAMED=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_GAMED=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_GAMED=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_GAMED=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_GAMED=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\sound\mididrv.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_GAMED=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -22990,44 +8523,8 @@ SOURCE=..\..\..\base\main.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\base\args.h"\
-	"..\..\..\base\backends\dc\DCLauncherDialog.h"\
-	"..\..\..\base\backends\wince\CELauncherDialog.h"\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\gameDetector.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\base\version.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\common\file.h"\
-	"..\..\..\base\common\timer.h"\
-	"..\..\..\base\gui\launcher.h"\
-	"..\..\..\base\gui\message.h"\
-	"..\..\..\base\gui\newgui.h"\
-	"..\..\..\base\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\base\args.h"\
-	"..\..\..\base\backends\dc\DCLauncherDialog.h"\
-	"..\..\..\base\backends\wince\CELauncherDialog.h"\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\gameDetector.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\base\version.h"\
-	"..\..\..\base\common\config-manager.h"\
-	"..\..\..\base\common\file.h"\
-	"..\..\..\base\common\timer.h"\
-	"..\..\..\base\gui\launcher.h"\
-	"..\..\..\base\gui\message.h"\
-	"..\..\..\base\gui\newgui.h"\
-	"..\..\..\base\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_MAIN_=\
@@ -23044,8 +8541,8 @@ DEP_CPP_MAIN_=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
@@ -23055,144 +8552,23 @@ DEP_CPP_MAIN_=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\launcher.h"\
 	"..\..\..\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"\
+	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_MAIN_=\
 	"..\..\..\base\allegro.h"\
 	"..\..\..\base\args.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\base\version.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\morphos_timer.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\gui\font.h"\
 	".\DL.h"\
 	".\DL_active.h"\
 	".\DL_audio.h"\
@@ -23217,9 +8593,10 @@ NODEP_CPP_MAIN_=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_MAIN_=\
+	"..\..\..\backends\dc\DCLauncherDialog.h"\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\wince\CELauncherDialog.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -23232,9 +8609,8 @@ DEP_CPP_MAIN_=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stack.h"\
@@ -23244,18 +8620,20 @@ DEP_CPP_MAIN_=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\dialog.h"\
 	"..\..\..\gui\launcher.h"\
 	"..\..\..\gui\message.h"\
 	"..\..\..\gui\newgui.h"\
 	"..\..\..\gui\object.h"\
+	"..\..\..\sound\mididrv.h"\
 	
 NODEP_CPP_MAIN_=\
 	"..\..\..\base\allegro.h"\
-	"..\..\..\common\compile.h"\
+	"..\..\..\base\args.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
@@ -23283,238 +8661,18 @@ NODEP_CPP_MAIN_=\
 	".\lose_code.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\gui\font.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\gui\font.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\gui\font.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_MAIN_=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\CELauncherDialog.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\timer.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\launcher.h"\
-	"..\..\..\gui\message.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	
-NODEP_CPP_MAIN_=\
-	"..\..\..\base\allegro.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\morphos_timer.h"\
-	"..\..\..\gui\font.h"\
-	".\DL.h"\
-	".\DL_active.h"\
-	".\DL_audio.h"\
-	".\DL_byteorder.h"\
-	".\DL_cdrom.h"\
-	".\DL_error.h"\
-	".\DL_events.h"\
-	".\DL_getenv.h"\
-	".\DL_joystick.h"\
-	".\DL_keyboard.h"\
-	".\DL_keysym.h"\
-	".\DL_main.h"\
-	".\DL_mouse.h"\
-	".\DL_mutex.h"\
-	".\DL_quit.h"\
-	".\DL_rwops.h"\
-	".\DL_timer.h"\
-	".\DL_types.h"\
-	".\DL_version.h"\
-	".\DL_video.h"\
-	".\egin_code.h"\
-	".\lose_code.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -23524,28 +8682,8 @@ SOURCE=..\..\..\base\plugins.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_PLUGI=\
-	"..\..\..\base\backends\fs\fs.h"\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\gameDetector.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\common\util.h"\
-	"..\..\..\base\dcloader.h"\
-	"..\..\..\base\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_PLUGI=\
-	"..\..\..\base\backends\fs\fs.h"\
-	"..\..\..\base\base\engine.h"\
-	"..\..\..\base\base\gameDetector.h"\
-	"..\..\..\base\base\plugins.h"\
-	"..\..\..\base\common\util.h"\
-	"..\..\..\base\dcloader.h"\
-	"..\..\..\base\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_PLUGI=\
@@ -23556,22 +8694,18 @@ DEP_CPP_PLUGI=\
 	"..\..\..\base\gameDetector.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_PLUGI=\
 	"..\..\..\base\dcloader.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -23584,19 +8718,15 @@ DEP_CPP_PLUGI=\
 	"..\..\..\base\gameDetector.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	
 NODEP_CPP_PLUGI=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\base\dcloader.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -23604,158 +8734,16 @@ NODEP_CPP_PLUGI=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_PLUGI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_PLUGI=\
-	"..\..\..\base\dcloader.h"\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_PLUGI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_PLUGI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_PLUGI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_PLUGI=\
-	"..\..\..\backends\fs\fs.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\gameDetector.h"\
-	"..\..\..\base\plugins.h"\
-	"..\..\..\common\list.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scaler.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	
-NODEP_CPP_PLUGI=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -23763,6 +8751,10 @@ NODEP_CPP_PLUGI=\
 
 SOURCE=..\..\..\base\plugins.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\..\base\version.h
+# End Source File
 # End Group
 # Begin Group "graphics"
 
@@ -23773,24 +8765,8 @@ SOURCE=..\..\..\graphics\animation.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ANIMA=\
-	"..\..\..\graphics\common\config-manager.h"\
-	"..\..\..\graphics\common\file.h"\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\animation.h"\
-	"..\..\..\graphics\sound\audiostream.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ANIMA=\
-	"..\..\..\graphics\common\config-manager.h"\
-	"..\..\..\graphics\common\file.h"\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\animation.h"\
-	"..\..\..\graphics\sound\audiostream.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_ANIMA=\
@@ -23800,8 +8776,8 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -23809,73 +8785,19 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\animation.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_ANIMA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ANIMA=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	".\DL_byteorder.h"\
-	".\peg2dec\mpeg2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
-
-DEP_CPP_ANIMA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ANIMA=\
-	"..\..\..\common\extend.h"\
 	".\DL_byteorder.h"\
 	".\peg2dec\mpeg2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -23884,8 +8806,8 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\map.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
@@ -23893,119 +8815,30 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\animation.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	
 NODEP_CPP_ANIMA=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
 	".\peg2dec\mpeg2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_ANIMA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ANIMA=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	".\peg2dec\mpeg2.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_ANIMA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ANIMA=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	".\peg2dec\mpeg2.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ANIMA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ANIMA=\
-	"..\..\..\common\extend.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_ANIMA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\savefile.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	
-NODEP_CPP_ANIMA=\
-	"..\..\..\common\extend.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -24019,18 +8852,8 @@ SOURCE=..\..\..\graphics\font.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_FONT_=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_FONT_=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_FONT_=\
@@ -24042,14 +8865,14 @@ DEP_CPP_FONT_=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_FONT_=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -24058,15 +8881,16 @@ DEP_CPP_FONT_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_FONT_=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -24074,118 +8898,95 @@ NODEP_CPP_FONT_=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_FONT_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_FONT_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_FONT_=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\graphics\font.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\graphics\fontman.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_FONTM=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_FONT_=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_FONTM=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_FONT_=\
+DEP_CPP_FONTM=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_FONT_=\
+NODEP_CPP_FONTM=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_FONT_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_FONT_=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_FONT_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_FONT_=\
-	"..\..\..\common\extend.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_FONT_=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_FONT_=\
-	"..\..\..\common\extend.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\graphics\font.h
+SOURCE=..\..\..\graphics\fontman.h
 # End Source File
 # Begin Source File
 
@@ -24193,18 +8994,8 @@ SOURCE=..\..\..\graphics\newfont.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_NEWFO=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_NEWFO=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\graphics\font.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_NEWFO=\
@@ -24216,14 +9007,14 @@ DEP_CPP_NEWFO=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_NEWFO=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -24232,15 +9023,16 @@ DEP_CPP_NEWFO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_NEWFO=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
@@ -24248,111 +9040,80 @@ NODEP_CPP_NEWFO=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_NEWFO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_NEWFO=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_NEWFO=\
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\graphics\newfont_big.cpp
+
+!IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_NEWFON=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_NEWFO=\
-	"..\..\..\common\compile.h"\
+NODEP_CPP_NEWFON=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_NEWFO=\
+DEP_CPP_NEWFON=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	
-NODEP_CPP_NEWFO=\
+NODEP_CPP_NEWFON=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
 	".\DL_byteorder.h"\
 	
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_NEWFO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_NEWFO=\
-	"..\..\..\common\extend.h"\
-	".\DL_byteorder.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_NEWFO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_NEWFO=\
-	"..\..\..\common\extend.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_NEWFO=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_NEWFO=\
-	"..\..\..\common\extend.h"\
-	
+!ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
 !ENDIF 
 
@@ -24363,20 +9124,8 @@ SOURCE=..\..\..\graphics\scummfont.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCUMM=\
-	"..\..\..\graphics\graphics\font.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	"..\..\..\graphics\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCUMM=\
-	"..\..\..\graphics\graphics\font.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	"..\..\..\graphics\stdafx.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SCUMM=\
@@ -24388,15 +9137,15 @@ DEP_CPP_SCUMM=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SCUMM=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\graphics\scumm_globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -24405,15 +9154,16 @@ DEP_CPP_SCUMM=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
+	"..\..\..\common\util.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	
 NODEP_CPP_SCUMM=\
-	"..\..\..\common\compile.h"\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\graphics\scumm_globals.h"\
@@ -24422,118 +9172,16 @@ NODEP_CPP_SCUMM=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_SCUMM=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_SCUMM=\
-	"..\..\..\common\compile.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_SCUMM=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_SCUMM=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	".\DL_byteorder.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_SCUMM=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCUMM=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_SCUMM=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\graphics\scumm_globals.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -24543,20 +9191,8 @@ SOURCE=..\..\..\graphics\surface.cpp
 
 !IF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SURFA=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\common\util.h"\
-	"..\..\..\graphics\graphics\surface.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SURFA=\
-	"..\..\..\graphics\common\stdafx.h"\
-	"..\..\..\graphics\common\util.h"\
-	"..\..\..\graphics\graphics\surface.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Release"
 
 DEP_CPP_SURFA=\
@@ -24566,13 +9202,13 @@ DEP_CPP_SURFA=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SURFA=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARMV4) Debug"
@@ -24584,13 +9220,13 @@ DEP_CPP_SURFA=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
 	"..\..\..\graphics\surface.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SURFA=\
+	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
+	".\DL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE ARM) Debug"
@@ -24603,38 +9239,8 @@ NODEP_CPP_SURFA=\
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SURFA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_SURFA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
 !ELSEIF  "$(CFG)" == "scummvm - Win32 (WCE SH3) Release"
 
-DEP_CPP_SURFA=\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\config.h"\
-	"..\..\..\graphics\surface.h"\
-	
-NODEP_CPP_SURFA=\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	
-
 !ENDIF 
 
 # End Source File
@@ -24644,10 +9250,6 @@ SOURCE=..\..\..\graphics\surface.h
 # End Source File
 # End Group
 # End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
 # Begin Group "Resource Files"
 
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"